Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/syscalls: Add pt_regs parameter to SYSCALL_DEFINE0() syscall wrapper

All system call wrappers should match the sys_call_ptr_t type. This is not
the case for system calls without parameters. Add the missing pt_regs
parameter there too.

Note: this is currently not a problem, since the parameter is unused.
However it prevents to create a correctly typed system call table in
C. With the current assembler implementation this works because of
missing type checking.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

+8 -8
+8 -8
arch/s390/include/asm/syscall_wrapper.h
··· 38 38 * named __s390x_sys_*() 39 39 */ 40 40 #define COMPAT_SYSCALL_DEFINE0(sname) \ 41 - long __s390_compat_sys_##sname(void); \ 41 + long __s390_compat_sys_##sname(struct pt_regs *__unused); \ 42 42 ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO); \ 43 - long __s390_compat_sys_##sname(void) 43 + long __s390_compat_sys_##sname(struct pt_regs *__unused) 44 44 45 45 #define SYSCALL_DEFINE0(sname) \ 46 46 SYSCALL_METADATA(_##sname, 0); \ 47 - long __s390_sys_##sname(void); \ 47 + long __s390_sys_##sname(struct pt_regs *__unused); \ 48 48 ALLOW_ERROR_INJECTION(__s390_sys_##sname, ERRNO); \ 49 - long __s390x_sys_##sname(void); \ 49 + long __s390x_sys_##sname(struct pt_regs *__unused); \ 50 50 ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \ 51 51 static inline long __do_sys_##sname(void); \ 52 - long __s390_sys_##sname(void) \ 52 + long __s390_sys_##sname(struct pt_regs *__unused) \ 53 53 { \ 54 54 return __do_sys_##sname(); \ 55 55 } \ 56 - long __s390x_sys_##sname(void) \ 56 + long __s390x_sys_##sname(struct pt_regs *__unused) \ 57 57 { \ 58 58 return __do_sys_##sname(); \ 59 59 } \ ··· 104 104 105 105 #define SYSCALL_DEFINE0(sname) \ 106 106 SYSCALL_METADATA(_##sname, 0); \ 107 - long __s390x_sys_##sname(void); \ 107 + long __s390x_sys_##sname(struct pt_regs *__unused); \ 108 108 ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \ 109 109 static inline long __do_sys_##sname(void); \ 110 - long __s390x_sys_##sname(void) \ 110 + long __s390x_sys_##sname(struct pt_regs *__unused) \ 111 111 { \ 112 112 return __do_sys_##sname(); \ 113 113 } \