Bury the conditionals from kernel_thread/kernel_execve series

All architectures have
	CONFIG_GENERIC_KERNEL_THREAD
	CONFIG_GENERIC_KERNEL_EXECVE
	__ARCH_WANT_SYS_EXECVE
None of them have __ARCH_WANT_KERNEL_EXECVE and there are only two callers
of kernel_execve() (which is a trivial wrapper for do_execve() now) left.
Kill the conditionals and make both callers use do_execve().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/Kconfig b/arch/Kconfig
index 8d698fb5ccc92f3a1065cdb2a350034a6e5f19bc..0a8dd0585d0d9e7b8ad7b79ce9d3bf86f73a38b1 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -271,12 +271,6 @@ config ARCH_WANT_OLD_COMPAT_IPC
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        bool
 
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        bool
 

-config GENERIC_KERNEL_THREAD
-       bool
-
-config GENERIC_KERNEL_EXECVE
-       bool
-

 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help
 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5dd7f5db24d45e6d98961ae53cc4478224068d8b..7e3710c0cce5a4c2ef51b8a889a061979a0b9b24 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -20,8 +20,6 @@ config ALPHA
        select GENERIC_CMOS_UPDATE
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_CMOS_UPDATE
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        help
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        help

diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index eb3a4664ced2f745ed24f2b165b7629ed58fe32b..68c75f2fadb90ba13dacdaa49a7b9afdd366f2df 100644 (file)
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -481,7 +481,6 @@
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8918a2dd89b40fffcae39bcd5376163774a978ba..b789654e7e2f7fcd8a8002d7129e378357432d74 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -11,8 +11,6 @@ config ARM
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select GENERIC_PCI_IOMAP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_PCI_IOMAP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 7cd13cc62624b223873d654b4c8acf40ddd9f4f2..21a2700d295715faabf5083d7dfde05f7628cfa8 100644 (file)
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -41,7 +41,6 @@
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_SOCKETCALL
 #endif
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_SOCKETCALL
 #endif

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 4b03c56ec3294e249f788a723b62827698cf9cf5..a846029bebcc6c29ac2c36c44b9fdef1ca25d3d2 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -7,8 +7,6 @@ config ARM64
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

-       select GENERIC_KERNEL_EXECVE
-       select GENERIC_KERNEL_THREAD

        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select HARDIRQS_SW_RESEND
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select HARDIRQS_SW_RESEND

diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index d69aeea6da1e83fd6fc36c435007f0104ba96af0..738322945d1a61e1a20879d4b21c2a6c3befb8fe 100644 (file)
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -27,6 +27,5 @@
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #endif
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #endif

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>
 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 649aeb9acecb4d0f3f5267038501e2822b10cf7e..06e73bf665e92cba042590dbe68a50a463d50f76 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -17,8 +17,6 @@ config AVR32
        select GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular
        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular

diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index f05a9804e8e22f929d2d9f0e61808f9f436b8eba..0bdf6371574e76eeaebfd821cbff2dbdb94dd16d 100644 (file)
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -39,7 +39,6 @@
 #define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index ab9ff4075f4d3b075692882234bb118a9d9b0349..b6f3ad5441c5f33f27c44850ca8d19c9898001b7 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -45,8 +45,6 @@ config BLACKFIN
        select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config GENERIC_CSUM
        def_bool y
 
 config GENERIC_CSUM
        def_bool y

diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index 460514a1a4e1e4235b19fddce5911cc93c321411..38711e28baac2a4c034f2d06f3cd31695665e833 100644 (file)
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -446,7 +446,6 @@
 #define __ARCH_WANT_SYS_NICE
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_NICE
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_VFORK
 
 /*
 #define __ARCH_WANT_SYS_VFORK
 
 /*

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 66eab3703c7571e77d608609c4e401ffce0ffd77..f6a3648f5ec3c7030a8c4294be4e3bee54a25b6c 100644 (file)
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -17,8 +17,6 @@ config C6X
        select OF
        select OF_EARLY_FLATTREE
        select GENERIC_CLOCKEVENTS
        select OF
        select OF_EARLY_FLATTREE
        select GENERIC_CLOCKEVENTS

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select MODULES_USE_ELF_RELA
 
 config MMU
        select MODULES_USE_ELF_RELA
 
 config MMU

diff --git a/arch/c6x/include/uapi/asm/unistd.h b/arch/c6x/include/uapi/asm/unistd.h
index f3987a8703d92ba18be7cbe949b155985ee59aa3..e7d09a614d1028b4e0673f73f05d3fa0388e23f5 100644 (file)
--- a/arch/c6x/include/uapi/asm/unistd.h
+++ b/arch/c6x/include/uapi/asm/unistd.h
@@ -14,7 +14,6 @@
  *   more details.
  */
 
  *   more details.
  */
 

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 
 /* Use the standard ABI for syscalls. */
 #define __ARCH_WANT_SYS_CLONE
 
 /* Use the standard ABI for syscalls. */

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 0cac6a49f230d9e20e78bdacf7fa2ebe736a4f59..c59a01dd9c0c627ee4afc7060b90deb0606811c1 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -49,8 +49,6 @@ config CRIS
        select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
        select GENERIC_CMOS_UPDATE
        select MODULES_USE_ELF_RELA
        select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
        select GENERIC_CMOS_UPDATE
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select CLONE_BACKWARDS2
 
 config HZ
        select CLONE_BACKWARDS2
 
 config HZ

diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h
index f27b542e0ebced925eff8ea7b5069db91a1cf0bc..5cda75a9cc1e2e1689a7bc128a3a9afaaba679cc 100644 (file)
--- a/arch/cris/include/asm/unistd.h
+++ b/arch/cris/include/asm/unistd.h
@@ -371,7 +371,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index df2eb4bd9fa2abbaa06c6978537fcabc88c22cf7..9d262645f6675275c9e2c7adca9a66b114d03b88 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -12,8 +12,6 @@ config FRV
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CPU_DEVICES
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CPU_DEVICES
        select ARCH_WANT_IPC_PARSE_VERSION

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config ZONE_DMA
        bool
 
 config ZONE_DMA
        bool

diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h
index 1807d8ea8cb5563873dca78bdf1e42300df4aa23..d685da17f5fb9954f1517e35cf6c931024e156ef 100644 (file)
--- a/arch/frv/include/asm/unistd.h
+++ b/arch/frv/include/asm/unistd.h
@@ -29,7 +29,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 04bef4d25b4aa0d6e2032794227865abc1b0e947..98fabd10e95fbb6f9a6b2d44700e0ae68fda3b68 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -8,8 +8,6 @@ config H8300
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config SYMBOL_PREFIX
        string
 
 config SYMBOL_PREFIX
        string

diff --git a/arch/h8300/include/asm/unistd.h b/arch/h8300/include/asm/unistd.h
index c2c2f5c7d6bf3515d8d13ee821a34269e1105ddc..566f94860c4560501d766d9e0b045406f41598c3 100644 (file)
--- a/arch/h8300/include/asm/unistd.h
+++ b/arch/h8300/include/asm/unistd.h
@@ -356,7 +356,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index e418803b6c8eb71dcf838829b4beebbea835819a..0744f7d7b1fd096b5ccbc71cab7305ea997fb3c3 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -31,8 +31,6 @@ config HEXAGON
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST
        select MODULES_USE_ELF_RELA
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.

diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h
index 2af81533bd0ffb305e9c473f2dbf39054244f9cc..4a87cc47075c37d4f3f43997876a1383206e8cba 100644 (file)
--- a/arch/hexagon/include/uapi/asm/unistd.h
+++ b/arch/hexagon/include/uapi/asm/unistd.h
@@ -27,7 +27,6 @@
  */
 
 #define sys_mmap2 sys_mmap_pgoff
  */
 
 #define sys_mmap2 sys_mmap_pgoff

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 
 #include <asm-generic/unistd.h>
 #define __ARCH_WANT_SYS_CLONE
 
 #include <asm-generic/unistd.h>

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 6706004681280ab211e11a8836f71535d4c1bd9f..3279646120e3be5bdbc970ca5297b5fce30011ee 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -42,8 +42,6 @@ config IA64
        select GENERIC_TIME_VSYSCALL_OLD
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select GENERIC_TIME_VSYSCALL_OLD
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to

diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 1574bca86138c317ab70fa75d5e19fa3911ae6d9..8b3ff2f5b86167eda40544dbda0099c568eaaf0e 100644 (file)
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -29,7 +29,6 @@
 
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 
 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER)
 
 
 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER)
 

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 5183f43a2cf7c3efd720a82d38312bc7b49422c7..f807721e19a52ee1f5b619cd0a742328e4515f46 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -15,8 +15,6 @@ config M32R
        select GENERIC_ATOMIC64
        select ARCH_USES_GETTIMEOFFSET
        select MODULES_USE_ELF_RELA
        select GENERIC_ATOMIC64
        select ARCH_USES_GETTIMEOFFSET
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config SBUS
        bool
 
 config SBUS
        bool

diff --git a/arch/m32r/include/asm/unistd.h b/arch/m32r/include/asm/unistd.h
index d9e7351af2a40775f610ce2ea2f70162dd868c9b..cbfa39158fef79000a17db428ca5ed3078de9e6c 100644 (file)
--- a/arch/m32r/include/asm/unistd.h
+++ b/arch/m32r/include/asm/unistd.h
@@ -352,7 +352,6 @@
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 953a7ba5d05025a776e5114b20acfbc56231bd3c..6710084e072abeb484cc00f93805352aa9d4099d 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -15,8 +15,6 @@ config M68K
        select FPU if MMU
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
        select FPU if MMU
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL
        select MODULES_USE_ELF_RELA
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL
        select MODULES_USE_ELF_RELA

diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index a021d67cdd72202b63d86abcc74216338c1a1e06..847994ce680456d0144cf0361085728316917b54 100644 (file)
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -31,7 +31,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 4bcf89148f3cec3767373776f309d47f687b8bb3..ba3b7c8c04b8150241f115696d00bd08747ac8f7 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -26,8 +26,6 @@ config MICROBLAZE
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select CLONE_BACKWARDS
 
 config SWAP
        select CLONE_BACKWARDS
 
 config SWAP

diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index 94d978986b756a61d026d87b98b6c50775e6faf2..38cabf4db548080fab71dd2e402daae01fd08f5c 100644 (file)
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -422,7 +422,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_VFORK
 #ifdef CONFIG_MMU
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_VFORK
 #ifdef CONFIG_MMU

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4183e62f178cd9d85027c32e95392f2f51f409ad..dba9390d37cf2c0d1672ca6dfb2b1453fb4294cf 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -40,8 +40,6 @@ config MIPS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL
        select MODULES_USE_ELF_RELA if 64BIT
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL
        select MODULES_USE_ELF_RELA if 64BIT

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 menu "Machine selection"
 
 
 menu "Machine selection"
 

diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index b306e2081cad9a4c03a66d9c82595e96581140da..9e47cc11aa263ba3991d680736bce6aeea41447e 100644 (file)
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -20,7 +20,6 @@
 #define __ARCH_OMIT_COMPAT_SYS_GETDENTS64
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_ALARM
 #define __ARCH_OMIT_COMPAT_SYS_GETDENTS64
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_ALARM

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 72471744a9124f36ca33b9f4bbd583fd96f88c2a..aa03f2e13385fe5083a50b17ae6f8c02e3ccb269 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -8,8 +8,6 @@ config MN10300
        select HAVE_ARCH_KGDB
        select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
        select GENERIC_CLOCKEVENTS
        select HAVE_ARCH_KGDB
        select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
        select GENERIC_CLOCKEVENTS

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select MODULES_USE_ELF_RELA
 
 config AM33_2
        select MODULES_USE_ELF_RELA
 
 config AM33_2

diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index cabf8ba73b27ca050410c7c203daf9138ceac846..e6d2ed4ba68f5ac01557e4a4375da4dc016bdb04 100644 (file)
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -43,7 +43,6 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e7f1a2993f780ab89795a73c8b2e9bd71bdd2ed6..05f2ba41ff1aadd52634a136b0f4450bba2970cc 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -22,8 +22,6 @@ config OPENRISC
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select MODULES_USE_ELF_RELA
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config MMU
        def_bool y
 
 config MMU
        def_bool y

diff --git a/arch/openrisc/include/uapi/asm/unistd.h b/arch/openrisc/include/uapi/asm/unistd.h
index 5082b8066325e7152c0a66b31696deb6f49368c9..ce40b71df0069d8516a94141556cb37ab32819ee 100644 (file)
--- a/arch/openrisc/include/uapi/asm/unistd.h
+++ b/arch/openrisc/include/uapi/asm/unistd.h
@@ -20,7 +20,6 @@
 
 #define sys_mmap2 sys_mmap_pgoff
 
 
 #define sys_mmap2 sys_mmap_pgoff
 

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_CLONE
 
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_CLONE
 

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e688a2be30f6a78659da7a2067c82a6c1808eb52..b77feffbadea9b91f46d85be47d35a0f49d4b2f4 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -22,8 +22,6 @@ config PARISC
        select GENERIC_STRNCPY_FROM_USER
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select GENERIC_STRNCPY_FROM_USER
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select CLONE_BACKWARDS
 
        help
        select CLONE_BACKWARDS
 
        help

diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index 1efef41659c9a570ee15e5b2bea1313f2b2b2991..3043194547cdc8d256ca5008846f836d95e6a864 100644 (file)
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -163,7 +163,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)       \
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 951a517a1a0fbedd3d9d1ca87bbcfab24986f9a1..17903f1f356be5790d6ddcde1ff3d5eabaf2ed78 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -141,10 +141,8 @@ config PPC
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER

-       select GENERIC_KERNEL_THREAD

        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_EXECVE

        select CLONE_BACKWARDS
 
 config EARLY_PRINTK
        select CLONE_BACKWARDS
 
 config EARLY_PRINTK

diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 76fe846ec40e7fe771e70c25d0f01bbe75ea4789..784872f937110e78a018c1abe20804881aa96e51 100644 (file)
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -55,7 +55,6 @@
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3cbb8757704ef6d2617328db099164406dfc1af3..5029ebf7110eb53be7c563e562daedca855be835 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -137,8 +137,6 @@ config S390
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
        select HAVE_ARCH_SECCOMP_FILTER
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
        select HAVE_ARCH_SECCOMP_FILTER

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select CLONE_BACKWARDS2
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select CLONE_BACKWARDS2

diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 086bb8eaf6abf3a75e6df3992519f69f1513851c..636530872516a64c8f30e42cf9a0bab4cee511bf 100644 (file)
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -53,7 +53,6 @@
 #   define __ARCH_WANT_COMPAT_SYS_TIME
 #   define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 # endif
 #   define __ARCH_WANT_COMPAT_SYS_TIME
 #   define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 # endif

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 45893390c7ddb4f32052764177b3f2d01949b53c..3b1482e7afacd37969f338158468bc95bb2dc8d6 100644 (file)
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -13,8 +13,6 @@ config SCORE
        select GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL
        select GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_REL

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select CLONE_BACKWARDS
 
 choice
        select CLONE_BACKWARDS
 
 choice

diff --git a/arch/score/include/asm/unistd.h b/arch/score/include/asm/unistd.h
index 56001c93095aaa7977d869e41f7866a5b0598f2c..9cb4260a5f3e3ea232fd1a328bac9f7e5ed854b3 100644 (file)
--- a/arch/score/include/asm/unistd.h
+++ b/arch/score/include/asm/unistd.h
@@ -4,7 +4,6 @@
 #define __ARCH_WANT_SYSCALL_NO_FLAGS
 #define __ARCH_WANT_SYSCALL_OFF_T
 #define __ARCH_WANT_SYSCALL_DEPRECATED
 #define __ARCH_WANT_SYSCALL_NO_FLAGS
 #define __ARCH_WANT_SYSCALL_OFF_T
 #define __ARCH_WANT_SYSCALL_DEPRECATED

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8451317eed58d3b79bc7ec3df8df6eac0b20fd0d..babc2b826c5caf5f26f9a029452e5067451190c1 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -40,8 +40,6 @@ config SUPERH
        select GENERIC_STRNLEN_USER
        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
        select MODULES_USE_ELF_RELA
        select GENERIC_STRNLEN_USER
        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast

diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h
index 43d3f26b2eab4cb8c891906a1e5e206cf6abd8cd..012004ed33305b84b32f1609932ec0b0bbc321a1 100644 (file)
--- a/arch/sh/include/asm/unistd.h
+++ b/arch/sh/include/asm/unistd.h
@@ -28,7 +28,6 @@
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
 # define __ARCH_WANT_SYS_RT_SIGACTION
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
 # define __ARCH_WANT_SYS_RT_SIGACTION

-# define __ARCH_WANT_SYS_EXECVE

 # define __ARCH_WANT_SYS_FORK
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE
 # define __ARCH_WANT_SYS_FORK
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 0c7d365fa402d90dacbc9566ee8eb121b726b75a..9f2edb5c555179de8d00ee5d2031546df35f8a9d 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -41,8 +41,6 @@ config SPARC
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select MODULES_USE_ELF_RELA
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config SPARC32
        def_bool !64BIT
 
 config SPARC32
        def_bool !64BIT

diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index c3e5d8b6417123b19ff0383abb063d85d82db243..0ecea6ed943e3a5b525e90711ef80a5cdbc16f57 100644 (file)
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -46,7 +46,6 @@
 #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
 #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif

-#define __ARCH_WANT_SYS_EXECVE

 
 /*
  * "Conditional" syscalls
 
 /*
  * "Conditional" syscalls

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index ea7f61e8bc9e14cf525d6bde75fb909433959372..875d008828b8ec619c295cf1b2d5c8923ea0389b 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -21,8 +21,6 @@ config TILE
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 # FIXME: investigate whether we need/want these options.
 #      select HAVE_IOREMAP_PROT
 
 # FIXME: investigate whether we need/want these options.
 #      select HAVE_IOREMAP_PROT

diff --git a/arch/tile/include/asm/unistd.h b/arch/tile/include/asm/unistd.h
index b51c6ee3cd6c2f701c88cd8d45647cc038bd822f..940831fe9e94906a04ec5bd1040f80720f6c1cf7 100644 (file)
--- a/arch/tile/include/asm/unistd.h
+++ b/arch/tile/include/asm/unistd.h
@@ -16,6 +16,5 @@
 #define __ARCH_WANT_SYS_LLSEEK
 #endif
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #define __ARCH_WANT_SYS_LLSEEK
 #endif
 #define __ARCH_WANT_SYS_NEWFSTATAT

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>
 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index c4fbb21e802b15349e7bfb09d06484b6163169cc..60651df5f95241bb063798df83e0af2545023e76 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -16,8 +16,6 @@ config UNICORE32
        select ARCH_WANT_FRAME_POINTERS
        select GENERIC_IOMAP
        select MODULES_USE_ELF_REL
        select ARCH_WANT_FRAME_POINTERS
        select GENERIC_IOMAP
        select MODULES_USE_ELF_REL

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip
        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip

diff --git a/arch/unicore32/include/uapi/asm/unistd.h b/arch/unicore32/include/uapi/asm/unistd.h
index 00cf5e286fcadc1fe584c02ff67e335367db64ec..d4cc4559d8485f23838417c6f51208b4925082d3 100644 (file)
--- a/arch/unicore32/include/uapi/asm/unistd.h
+++ b/arch/unicore32/include/uapi/asm/unistd.h
@@ -12,5 +12,4 @@
 
 /* Use the standard ABI for syscalls. */
 #include <asm-generic/unistd.h>
 
 /* Use the standard ABI for syscalls. */
 #include <asm-generic/unistd.h>

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0df6e7d845398549317502cecc2a411084edb6aa..01ca0ebaff0ee42da29f8d5362a85f4b9b74bb3c 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -108,8 +108,6 @@ config X86
        select GENERIC_STRNLEN_USER
        select HAVE_RCU_USER_QS if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING
        select GENERIC_STRNLEN_USER
        select HAVE_RCU_USER_QS if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select MODULES_USE_ELF_REL if X86_32
        select MODULES_USE_ELF_RELA if X86_64
        select CLONE_BACKWARDS if X86_32
        select MODULES_USE_ELF_REL if X86_32
        select MODULES_USE_ELF_RELA if X86_64
        select CLONE_BACKWARDS if X86_32

diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index 0e7dea7d366982d18ab89cfe17a6a6b99edc255f..9dcfcc1d6f929714d453075211d115b0eec4ae84 100644 (file)
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -50,7 +50,6 @@
 # define __ARCH_WANT_SYS_TIME
 # define __ARCH_WANT_SYS_UTIME
 # define __ARCH_WANT_SYS_WAITPID
 # define __ARCH_WANT_SYS_TIME
 # define __ARCH_WANT_SYS_UTIME
 # define __ARCH_WANT_SYS_WAITPID

-# define __ARCH_WANT_SYS_EXECVE

 # define __ARCH_WANT_SYS_FORK
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE
 # define __ARCH_WANT_SYS_FORK
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE

diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 8f51c39750d19c42700397506df03869d8f8dd43..0fd20f241e40c44053987d6aaa0782f9789ddf6f 100644 (file)
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -13,8 +13,6 @@ endmenu
 config UML_X86
        def_bool y
        select GENERIC_FIND_FIRST_BIT
 config UML_X86
        def_bool y
        select GENERIC_FIND_FIRST_BIT

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

 
 config 64BIT
        bool "64-bit kernel" if SUBARCH = "x86"
 
 config 64BIT
        bool "64-bit kernel" if SUBARCH = "x86"

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2481f267be298a9c9b2f0891d703a15b8d725def..03a8c107e07eefb32bbe5a420b4d45018dfbe8ef 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -13,8 +13,6 @@ config XTENSA
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
        select GENERIC_PCI_IOMAP
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
        select GENERIC_PCI_IOMAP

-       select GENERIC_KERNEL_THREAD
-       select GENERIC_KERNEL_EXECVE

        select ARCH_WANT_OPTIONAL_GPIOLIB
        select CLONE_BACKWARDS
        help
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select CLONE_BACKWARDS
        help

diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h
index e002dbcc88b6e621bf25c8a73ce2e60641912126..eb63ea87815c9e9eba1e1ad3af11c70297e3d7c5 100644 (file)
--- a/arch/xtensa/include/asm/unistd.h
+++ b/arch/xtensa/include/asm/unistd.h
@@ -1,7 +1,6 @@
 #ifndef _XTENSA_UNISTD_H
 #define _XTENSA_UNISTD_H
 
 #ifndef _XTENSA_UNISTD_H
 #define _XTENSA_UNISTD_H
 

-#define __ARCH_WANT_SYS_EXECVE

 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>
 
 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>
 

diff --git a/fs/exec.c b/fs/exec.c
index 721a299295117f92d271f17afd224db1787712a1..090ac91da2e90960815b434fb9e06a2a70e4c723 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1657,7 +1657,6 @@ int get_dumpable(struct mm_struct *mm)
        return __get_dumpable(mm->flags);
 }
 
        return __get_dumpable(mm->flags);
 }
 

-#ifdef __ARCH_WANT_SYS_EXECVE

 SYSCALL_DEFINE3(execve,
                const char __user *, filename,
                const char __user *const __user *, argv,
 SYSCALL_DEFINE3(execve,
                const char __user *, filename,
                const char __user *const __user *, argv,


@@ -1685,23 +1684,3 @@ asmlinkage long compat_sys_execve(const char __user * filename,
        return error;
 }
 #endif
        return error;
 }
 #endif

-#endif
-
-#ifdef __ARCH_WANT_KERNEL_EXECVE
-int kernel_execve(const char *filename,
-                 const char *const argv[],
-                 const char *const envp[])
-{
-       int ret = do_execve(filename,
-                       (const char __user *const __user *)argv,
-                       (const char __user *const __user *)envp);
-       if (ret < 0)
-               return ret;
-
-       /*
-        * We were successful.  We won't be returning to our caller, but
-        * instead to user space by manipulating the kernel stack.
-        */
-       ret_from_kernel_execve(current_pt_regs());
-}
-#endif

diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 2630c9b41a8680c9411475f99b6f81f3efdc4f79..8c1388c6ae277bf06648efca4c550a15a0b2822d 100644 (file)
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -121,8 +121,4 @@ extern void install_exec_creds(struct linux_binprm *bprm);
 extern void set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
 
 extern void set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
 

-#ifdef __ARCH_WANT_KERNEL_EXECVE
-extern void ret_from_kernel_execve(struct pt_regs *normal) __noreturn;
-#endif
-

 #endif /* _LINUX_BINFMTS_H */
 #endif /* _LINUX_BINFMTS_H */

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 1162258bcaf0a939d7bd3993c42e01008a88a743..9e5a54e3d84ff9a862f5af5945eceaef6d9cfeff 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2291,9 +2291,7 @@ extern int do_execve(const char *,
                     const char __user * const __user *);
 extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *);
 struct task_struct *fork_idle(int);
                     const char __user * const __user *);
 extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *);
 struct task_struct *fork_idle(int);

-#ifdef CONFIG_GENERIC_KERNEL_THREAD

 extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);

-#endif

 
 extern void set_task_comm(struct task_struct *tsk, char *from);
 extern char *get_task_comm(char *to, struct task_struct *tsk);
 
 extern void set_task_comm(struct task_struct *tsk, char *from);
 extern char *get_task_comm(char *to, struct task_struct *tsk);

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 91835e7f364d5523919735e2901492e634e85f7d..9fe5f946526e866d2df52d792d7989628cbf4ac3 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -827,15 +827,6 @@ asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
                                  const char  __user *pathname);
 asmlinkage long sys_syncfs(int fd);
 
                                  const char  __user *pathname);
 asmlinkage long sys_syncfs(int fd);
 

-#ifndef CONFIG_GENERIC_KERNEL_EXECVE
-int kernel_execve(const char *filename, const char *const argv[], const char *const envp[]);
-#else
-#define kernel_execve(filename, argv, envp) \
-       do_execve(filename, \
-               (const char __user *const __user *)argv, \
-               (const char __user *const __user *)envp)
-#endif
-

 asmlinkage long sys_fork(void);
 asmlinkage long sys_vfork(void);
 #ifdef CONFIG_CLONE_BACKWARDS
 asmlinkage long sys_fork(void);
 asmlinkage long sys_vfork(void);
 #ifdef CONFIG_CLONE_BACKWARDS

diff --git a/init/main.c b/init/main.c
index e33e09df3cbc61ad11736776ef4138010df1de8e..155ac208d5812e0bf85b89406c982d4fd6ce03ad 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -797,7 +797,9 @@ static void __init do_pre_smp_initcalls(void)
 static int run_init_process(const char *init_filename)
 {
        argv_init[0] = init_filename;
 static int run_init_process(const char *init_filename)
 {
        argv_init[0] = init_filename;

-       return kernel_execve(init_filename, argv_init, envp_init);
+       return do_execve(init_filename,
+               (const char __user *const __user *)argv_init,
+               (const char __user *const __user *)envp_init);

 }
 
 static void __init kernel_init_freeable(void);
 }
 
 static void __init kernel_init_freeable(void);

diff --git a/kernel/fork.c b/kernel/fork.c
index 540730783433ccc87d8a6104a68b5a708c065414..389712ffc0ad073442800978e3aa098d8d72c64e 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1623,7 +1623,6 @@ long do_fork(unsigned long clone_flags,
        return nr;
 }
 
        return nr;
 }
 

-#ifdef CONFIG_GENERIC_KERNEL_THREAD

 /*
  * Create a kernel thread.
  */
 /*
  * Create a kernel thread.
  */


@@ -1632,7 +1631,6 @@ pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
        return do_fork(flags|CLONE_VM|CLONE_UNTRACED, (unsigned long)fn,
                (unsigned long)arg, NULL, NULL);
 }
        return do_fork(flags|CLONE_VM|CLONE_UNTRACED, (unsigned long)fn,
                (unsigned long)arg, NULL, NULL);
 }

-#endif

 
 #ifdef __ARCH_WANT_SYS_FORK
 SYSCALL_DEFINE0(fork)
 
 #ifdef __ARCH_WANT_SYS_FORK
 SYSCALL_DEFINE0(fork)

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 1c317e386831869a3c4ff17a675a06b3b985c06d..0023a87e8de69357b043ab58c072417200433a29 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -219,9 +219,9 @@ static int ____call_usermodehelper(void *data)
 
        commit_creds(new);
 
 
        commit_creds(new);
 

-       retval = kernel_execve(sub_info->path,
-                              (const char *const *)sub_info->argv,
-                              (const char *const *)sub_info->envp);
+       retval = do_execve(sub_info->path,
+                          (const char __user *const __user *)sub_info->argv,
+                          (const char __user *const __user *)sub_info->envp);

        if (!retval)
                return 0;
 
        if (!retval)
                return 0;