Skip to content

Commit 7afb095

Browse files
committed
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>
1 parent b2da5f6 commit 7afb095

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

arch/s390/include/asm/syscall_wrapper.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@
3838
* named __s390x_sys_*()
3939
*/
4040
#define COMPAT_SYSCALL_DEFINE0(sname) \
41-
long __s390_compat_sys_##sname(void); \
41+
long __s390_compat_sys_##sname(struct pt_regs *__unused); \
4242
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)
4444

4545
#define SYSCALL_DEFINE0(sname) \
4646
SYSCALL_METADATA(_##sname, 0); \
47-
long __s390_sys_##sname(void); \
47+
long __s390_sys_##sname(struct pt_regs *__unused); \
4848
ALLOW_ERROR_INJECTION(__s390_sys_##sname, ERRNO); \
49-
long __s390x_sys_##sname(void); \
49+
long __s390x_sys_##sname(struct pt_regs *__unused); \
5050
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
5151
static inline long __do_sys_##sname(void); \
52-
long __s390_sys_##sname(void) \
52+
long __s390_sys_##sname(struct pt_regs *__unused) \
5353
{ \
5454
return __do_sys_##sname(); \
5555
} \
56-
long __s390x_sys_##sname(void) \
56+
long __s390x_sys_##sname(struct pt_regs *__unused) \
5757
{ \
5858
return __do_sys_##sname(); \
5959
} \
@@ -104,10 +104,10 @@
104104

105105
#define SYSCALL_DEFINE0(sname) \
106106
SYSCALL_METADATA(_##sname, 0); \
107-
long __s390x_sys_##sname(void); \
107+
long __s390x_sys_##sname(struct pt_regs *__unused); \
108108
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
109109
static inline long __do_sys_##sname(void); \
110-
long __s390x_sys_##sname(void) \
110+
long __s390x_sys_##sname(struct pt_regs *__unused) \
111111
{ \
112112
return __do_sys_##sname(); \
113113
} \

0 commit comments

Comments
 (0)