Commit 7afb095d authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent b2da5f64

arch/s390/include/asm/syscall_wrapper.h

+8 −8
Original line number Diff line number Diff line
@@ -38,22 +38,22 @@ 
 * named __s390x_sys_*()

 */

#define COMPAT_SYSCALL_DEFINE0(sname)					\

	long __s390_compat_sys_##sname(void);				\

	long __s390_compat_sys_##sname(struct pt_regs *__unused);	\

	ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO);	\

	long __s390_compat_sys_##sname(void)

	long __s390_compat_sys_##sname(struct pt_regs *__unused)



#define SYSCALL_DEFINE0(sname)						\

	SYSCALL_METADATA(_##sname, 0);					\

	long __s390_sys_##sname(void);					\

	long __s390_sys_##sname(struct pt_regs *__unused);		\

	ALLOW_ERROR_INJECTION(__s390_sys_##sname, ERRNO);		\

	long __s390x_sys_##sname(void);					\

	long __s390x_sys_##sname(struct pt_regs *__unused);		\

	ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);		\

	static inline long __do_sys_##sname(void);			\

	long __s390_sys_##sname(void)					\

	long __s390_sys_##sname(struct pt_regs *__unused)		\

	{								\

		return __do_sys_##sname();				\

	}								\

	long __s390x_sys_##sname(void)					\

	long __s390x_sys_##sname(struct pt_regs *__unused)		\

	{								\

		return __do_sys_##sname();				\

	}								\
@@ -104,10 +104,10 @@ 


#define SYSCALL_DEFINE0(sname)						\

	SYSCALL_METADATA(_##sname, 0);					\

	long __s390x_sys_##sname(void);					\

	long __s390x_sys_##sname(struct pt_regs *__unused);		\

	ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);		\

	static inline long __do_sys_##sname(void);			\

	long __s390x_sys_##sname(void)					\

	long __s390x_sys_##sname(struct pt_regs *__unused)		\

	{								\

		return __do_sys_##sname();				\

	}								\