Commit 39589ada authored by Sven Schnelle's avatar Sven Schnelle Committed by Vasily Gorbik
Browse files

s390: remove asmlinkage 



On s390 asmlinkage is a nop, so remove it.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 56e62a73

arch/s390/include/asm/preempt.h

+2 −2
Original line number Diff line number Diff line
@@ -131,9 +131,9 @@ static inline bool should_resched(int preempt_offset) 
#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */



#ifdef CONFIG_PREEMPTION

extern asmlinkage void preempt_schedule(void);

extern void preempt_schedule(void);

#define __preempt_schedule() preempt_schedule()

extern asmlinkage void preempt_schedule_notrace(void);

extern void preempt_schedule_notrace(void);

#define __preempt_schedule_notrace() preempt_schedule_notrace()

#endif /* CONFIG_PREEMPTION */

arch/s390/include/asm/syscall_wrapper.h

+15 −15
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
})



#define __S390_SYS_STUBx(x, name, ...)					\

	asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));\

	long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));		\

	ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO);			\

	asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))\

	long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))		\

	{								\

		long ret = __s390x_sys##name(__MAP(x,__SC_COMPAT_CAST,__VA_ARGS__));\

		__MAP(x,__SC_TEST,__VA_ARGS__);				\
@@ -45,17 +45,17 @@ 
 */

#define COMPAT_SYSCALL_DEFINE0(sname)					\

	SYSCALL_METADATA(_##sname, 0);					\

	asmlinkage long __s390_compat_sys_##sname(void);		\

	long __s390_compat_sys_##sname(void);				\

	ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO);	\

	asmlinkage long __s390_compat_sys_##sname(void)

	long __s390_compat_sys_##sname(void)



#define SYSCALL_DEFINE0(sname)						\

	SYSCALL_METADATA(_##sname, 0);					\

	asmlinkage long __s390x_sys_##sname(void);			\

	long __s390x_sys_##sname(void);					\

	ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);		\

	asmlinkage long __s390_sys_##sname(void)			\

	long __s390_sys_##sname(void)					\

		__attribute__((alias(__stringify(__s390x_sys_##sname)))); \

	asmlinkage long __s390x_sys_##sname(void)

	long __s390x_sys_##sname(void)



#define COND_SYSCALL(name)						\

	cond_syscall(__s390x_sys_##name);				\
@@ -69,13 +69,13 @@ 
	__diag_push();								\

	__diag_ignore(GCC, 8, "-Wattribute-alias",				\

		      "Type aliasing is used to sanitize syscall arguments");\

	asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\

	asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\

	long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));		\

	long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))		\

		__attribute__((alias(__stringify(__se_compat_sys##name))));	\

	ALLOW_ERROR_INJECTION(__s390_compat_sys##name, ERRNO);			\

	static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\

	asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\

	asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\

	long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));		\

	long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))		\

	{									\

		long ret = __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\

		__MAP(x,__SC_TEST,__VA_ARGS__);					\
@@ -101,9 +101,9 @@ 


#define SYSCALL_DEFINE0(sname)						\

	SYSCALL_METADATA(_##sname, 0);					\

	asmlinkage long __s390x_sys_##sname(void);			\

	long __s390x_sys_##sname(void);					\

	ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);		\

	asmlinkage long __s390x_sys_##sname(void)

	long __s390x_sys_##sname(void)



#define COND_SYSCALL(name)						\

	cond_syscall(__s390x_sys_##name)
@@ -117,13 +117,13 @@ 
	__diag_push();								\

	__diag_ignore(GCC, 8, "-Wattribute-alias",				\

		      "Type aliasing is used to sanitize syscall arguments");\

	asmlinkage long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\

	long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))			\

		__attribute__((alias(__stringify(__se_sys##name))));		\

	ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO);			\

	long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));			\

	static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\

	__S390_SYS_STUBx(x, name, __VA_ARGS__)					\

	asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))		\

	long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))			\

	{									\

		long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));	\

		__MAP(x,__SC_TEST,__VA_ARGS__);					\