aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-21 17:18:07 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-03-03 22:58:30 -0500
commit22d1a35da0e247a006c286842a1846acb4ffed4f (patch)
tree45f85354e11a45903a7789169d09e90f1190b5fb /include/linux
parentconsolidate cond_syscall and SYSCALL_ALIAS declarations (diff)
downloadlinux-dev-22d1a35da0e247a006c286842a1846acb4ffed4f.tar.xz
linux-dev-22d1a35da0e247a006c286842a1846acb4ffed4f.zip
make HAVE_SYSCALL_WRAPPERS unconditional
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/compat.h9
-rw-r--r--include/linux/syscalls.h10
2 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 8c1dfc8d830d..110132527e4c 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -40,8 +40,6 @@
#define COMPAT_SYSCALL_DEFINE6(name, ...) \
COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
-
#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
@@ -52,13 +50,6 @@
SYSCALL_ALIAS(compat_sys##name, compat_SyS##name); \
static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-#else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-
-#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
- asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-
-#endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-
#ifndef compat_user_stack_pointer
#define compat_user_stack_pointer() current_user_stack_pointer()
#endif
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 87584373305d..3b6fc13cb46a 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -198,8 +198,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
#endif
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
-
#define SYSCALL_DEFINE(name) static inline long SYSC_##name
#define __SYSCALL_DEFINEx(x, name, ...) \
@@ -213,14 +211,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
SYSCALL_ALIAS(sys##name, SyS##name); \
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-#else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-
-#define SYSCALL_DEFINE(name) asmlinkage long sys_##name
-#define __SYSCALL_DEFINEx(x, name, ...) \
- asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-
-#endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-
asmlinkage long sys_time(time_t __user *tloc);
asmlinkage long sys_stime(time_t __user *tptr);
asmlinkage long sys_gettimeofday(struct timeval __user *tv,