10 files changed, 0 insertions, 30 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 5a1779c93940..892d6176fcf3 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -157,9 +157,6 @@ config ARCH_USE_BUILTIN_BSWAP
          instructions should set this. And it shouldn't hurt to set it
          on architectures that don't have such instructions.
 
-config HAVE_SYSCALL_WRAPPERS
-        bool
-
 config KRETPROBES
         def_bool y
         depends on KPROBES && HAVE_KRETPROBES
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5833aa441481..5469f7b444ab 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -4,7 +4,6 @@ config ALPHA
         select HAVE_AOUT
         select HAVE_IDE
         select HAVE_OPROFILE
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_PCSPKR_PLATFORM
         select HAVE_PERF_EVENTS
         select HAVE_DMA_ATTRS
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ae9c716c46bb..32eb3d67bbef 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1737,7 +1737,6 @@ config 32BIT
 config 64BIT
         bool "64-bit kernel"
         depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
-        select HAVE_SYSCALL_WRAPPERS
         help
           Select this option if you want to build a 64-bit kernel.
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b89d7eb730a2..f460e32fe2a0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -113,7 +113,6 @@ config PPC
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_SYSCALL_WRAPPERS if PPC64
         select GENERIC_ATOMIC64 if PPC32
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_PERF_EVENTS
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4b505370a1d5..f6cc1528df89 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -131,7 +131,6 @@ config S390
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_UID16 if 32BIT
         select HAVE_VIRT_CPU_ACCOUNTING
         select HAVE_VIRT_TO_BUS
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 289127d5241c..67388cdb18c1 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -62,7 +62,6 @@ config SPARC64
         select HAVE_RCU_TABLE_FREE if SMP
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_ARCH_TRANSPARENT_HUGEPAGE
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index ff496ab1e794..95bd2ef6c943 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -16,7 +16,6 @@ config TILE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
         select HAVE_DEBUG_BUGVERBOSE
-        select HAVE_SYSCALL_WRAPPERS if TILEGX
         select HAVE_VIRT_TO_BUS
         select SYS_HYPERVISOR
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
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,
diff --git a/ipc/sem.c b/ipc/sem.c
index 58d31f1c1eb5..e7236df7a470 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1156,13 +1156,11 @@ SYSCALL_DEFINE(semctl)(int semid, int semnum, int cmd, union semun arg)
                 return -EINVAL;
         }
 }
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
 asmlinkage long SyS_semctl(int semid, int semnum, int cmd, union semun arg)
 {
         return SYSC_semctl((int) semid, (int) semnum, (int) cmd, arg);
 }
 SYSCALL_ALIAS(sys_semctl, SyS_semctl);
-#endif
 
 /* If the task doesn't already have a undo_list, then allocate one
  * here.  We guarantee there is only one thread using this undo list,