kpatch-syscall: update for s390x RHEL-9.6 backports

RHEL-9.6 backported the upstream v6.3 s390x syscall updates, so add a distro-specific kernel version check around the correct definitions. Signed-off-by: Joe Lawrence <[email protected]>
joe-lawrence · Dec 9, 2024 · 73fcbe0 · 73fcbe0
1 parent cbf2bc9
commit 73fcbe0
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/kmod/patch/kpatch-syscall.h b/kmod/patch/kpatch-syscall.h
@@ -91,8 +91,23 @@
 
 #elif defined(CONFIG_S390)
 
-/* arch/s390/include/asm/syscall_wrapper.h versions */
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+#  define KPATCH_SYSCALL_WRAPPERS_V2
+# else
+#  define KPATCH_SYSCALL_WRAPPERS_V1
+# endif
+
+# if defined(RHEL_RELEASE_CODE)
+#  if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 6)
+#   define KPATCH_SYSCALL_WRAPPERS_V2
+#  else
+#   define KPATCH_SYSCALL_WRAPPERS_V1
+#  endif
+# endif
+
+
+/* arch/s390/include/asm/syscall_wrapper.h versions */
+#if defined(KPATCH_SYSCALL_WRAPPERS_V2)
 
 #define __KPATCH_S390_SYS_STUBx(x, name, ...)                                          \
 	long __s390_sys##name(struct pt_regs *regs);                            \
@@ -124,7 +139,8 @@
                return __kpatch_do_sys##name(__MAP(x, __SC_CAST, __VA_ARGS__));        \
        }                                                                       \
        static inline long __kpatch_do_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__))
-# else
+
+# else /* KPATCH_SYSCALL_WRAPPERS_V2 */
 
 #define __KPATCH_S390_SYS_STUBx(x, name, ...)					\
 	long __s390_sys##name(struct pt_regs *regs);				\
@@ -157,7 +173,7 @@
 	__diag_pop();									\
 	static inline long __kpatch_do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 
-#endif /* LINUX_VERSION_CODE */
+#endif /* KPATCH_SYSCALL_WRAPPERS_V2 */
 
 #elif defined(CONFIG_PPC64)