tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
s390: remove asmlinkage
On s390 asmlinkage is a nop, so remove it.
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
authored by
Sven Schnelle
and committed by
Vasily Gorbik
39589ada
56e62a73
+17
-17
+2
-2
arch/s390/include/asm/preempt.h
+2
-2
arch/s390/include/asm/preempt.h
···
131
131
#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */
132
132
133
133
#ifdef CONFIG_PREEMPTION
134
-
extern asmlinkage void preempt_schedule(void);
134
+
extern void preempt_schedule(void);
135
135
#define __preempt_schedule() preempt_schedule()
136
-
extern asmlinkage void preempt_schedule_notrace(void);
136
+
extern void preempt_schedule_notrace(void);
137
137
#define __preempt_schedule_notrace() preempt_schedule_notrace()
138
138
#endif /* CONFIG_PREEMPTION */
139
139
+15
-15
arch/s390/include/asm/syscall_wrapper.h
+15
-15
arch/s390/include/asm/syscall_wrapper.h
···
30
30
})
31
31
32
32
#define __S390_SYS_STUBx(x, name, ...) \
33
-
asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
33
+
long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
34
34
ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO); \
35
-
asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
35
+
long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
36
36
{ \
37
37
long ret = __s390x_sys##name(__MAP(x,__SC_COMPAT_CAST,__VA_ARGS__));\
38
38
__MAP(x,__SC_TEST,__VA_ARGS__); \
···
45
45
*/
46
46
#define COMPAT_SYSCALL_DEFINE0(sname) \
47
47
SYSCALL_METADATA(_##sname, 0); \
48
-
asmlinkage long __s390_compat_sys_##sname(void); \
48
+
long __s390_compat_sys_##sname(void); \
49
49
ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO); \
50
-
asmlinkage long __s390_compat_sys_##sname(void)
50
+
long __s390_compat_sys_##sname(void)
51
51
52
52
#define SYSCALL_DEFINE0(sname) \
53
53
SYSCALL_METADATA(_##sname, 0); \
54
-
asmlinkage long __s390x_sys_##sname(void); \
54
+
long __s390x_sys_##sname(void); \
55
55
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
56
-
asmlinkage long __s390_sys_##sname(void) \
56
+
long __s390_sys_##sname(void) \
57
57
__attribute__((alias(__stringify(__s390x_sys_##sname)))); \
58
-
asmlinkage long __s390x_sys_##sname(void)
58
+
long __s390x_sys_##sname(void)
59
59
60
60
#define COND_SYSCALL(name) \
61
61
cond_syscall(__s390x_sys_##name); \
···
69
69
__diag_push(); \
70
70
__diag_ignore(GCC, 8, "-Wattribute-alias", \
71
71
"Type aliasing is used to sanitize syscall arguments");\
72
-
asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
73
-
asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
72
+
long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
73
+
long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
74
74
__attribute__((alias(__stringify(__se_compat_sys##name)))); \
75
75
ALLOW_ERROR_INJECTION(__s390_compat_sys##name, ERRNO); \
76
76
static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
77
-
asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
78
-
asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
77
+
long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
78
+
long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
79
79
{ \
80
80
long ret = __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
81
81
__MAP(x,__SC_TEST,__VA_ARGS__); \
···
101
101
102
102
#define SYSCALL_DEFINE0(sname) \
103
103
SYSCALL_METADATA(_##sname, 0); \
104
-
asmlinkage long __s390x_sys_##sname(void); \
104
+
long __s390x_sys_##sname(void); \
105
105
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
106
-
asmlinkage long __s390x_sys_##sname(void)
106
+
long __s390x_sys_##sname(void)
107
107
108
108
#define COND_SYSCALL(name) \
109
109
cond_syscall(__s390x_sys_##name)
···
117
117
__diag_push(); \
118
118
__diag_ignore(GCC, 8, "-Wattribute-alias", \
119
119
"Type aliasing is used to sanitize syscall arguments");\
120
-
asmlinkage long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
120
+
long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
121
121
__attribute__((alias(__stringify(__se_sys##name)))); \
122
122
ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO); \
123
123
long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
124
124
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
125
125
__S390_SYS_STUBx(x, name, __VA_ARGS__) \
126
-
asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
126
+
long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
127
127
{ \
128
128
long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__)); \
129
129
__MAP(x,__SC_TEST,__VA_ARGS__); \