kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS

We've switched over every architecture that supports SMP to it, so
remove the new useless config variable.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index ded747c7b74c32e66fa681d7e710528c23421f9e..f1cf895c040fb674ed1c07e5cc43459e9244a8f6 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -207,9 +207,6 @@ config HAVE_DMA_ATTRS
 config HAVE_DMA_CONTIGUOUS
        bool
 
-config USE_GENERIC_SMP_HELPERS
-       bool
-
 config GENERIC_SMP_IDLE_THREAD
        bool
 

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 35a300d4a9fb37f3a08e3f63365c72bcc2a3ecbf..8d2a4833acda7519b79a5d84436b6e0562dfd933 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -522,7 +522,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config SMP
        bool "Symmetric multi-processing support"
        depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL
-       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 5ede5460c80692502730d69510a57975b386fe8d..2ee0c9bfd0325537a5d9299649abac4992b722f5 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -125,7 +125,6 @@ config ARC_PLAT_NEEDS_CPU_TO_DMA
 config SMP
        bool "Symmetric Multi-Processing (Incomplete)"
        default n
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 603d661b445d4a2690c7bcb5dbd9cb6d282cc0e6..00c1ff45a158eecbb5736e05d7e64bf9f99ab7f5 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1432,7 +1432,6 @@ config SMP
        depends on GENERIC_CLOCKEVENTS
        depends on HAVE_SMP
        depends on MMU || ARM_MPU
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index bb0bf1bfc05dd6868bf58d7cf4fac276c143db43..9714fe0403b7611dcbd5a405e19a8c018dcd86d7 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -143,7 +143,6 @@ config CPU_BIG_ENDIAN
 
 config SMP
        bool "Symmetric Multi-Processing"
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU.  If
          you say N here, the kernel will run on single and

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index e887b57c3176705d90beeebcc39123836f5eff1b..9ceccef9c6490ff229fc1851a6f467be7e5e4232 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -34,7 +34,6 @@ config BLACKFIN
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_PROBE
-       select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
        select GENERIC_SMP_IDLE_THREAD
        select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 99041b07e61094d964fd1289481c11f739407d04..09df2608f40a9c3dc73220abf96e177b5ade447f 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -4,7 +4,6 @@ comment "Linux Kernel Configuration for Hexagon"
 config HEXAGON
        def_bool y
        select HAVE_OPROFILE
-       select USE_GENERIC_SMP_HELPERS if SMP
        # Other pending projects/to-do items.
        # select HAVE_REGS_AND_STACK_ACCESS_API
        # select HAVE_HW_BREAKPOINT if PERF_EVENTS

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 7740ab10a17192cb0596d0ee442282d549b3ba33..dfe85e92ca2e37060c65b1a4f1fb70afd69a8fa5 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -343,7 +343,6 @@ config FORCE_MAX_ZONEORDER
 
 config SMP
        bool "Symmetric multi-processing support"
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, say N.  If you have a system with more

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 75661fbf4529e6c903fcb2bb61e3b48e5656fd04..09ef94a8a7c3a18632f7d7bfb3f6edb291100c34 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -275,7 +275,6 @@ source "kernel/Kconfig.preempt"
 
 config SMP
        bool "Symmetric multi-processing support"
-       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 36368eb07e13fe629d00ac1f1fdcc8ff06220ba2..e56abd2c1b4ffbac8f6fbd972ec029c3c69169fe 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -111,7 +111,6 @@ config METAG_META21
 config SMP
        bool "Symmetric multi-processing support"
        depends on METAG_META21 && METAG_META21_MMU
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one thread running
          Linux. If you have a system with only one thread running Linux,

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 17cc7ff8458ce2d16f9f8a3be5a4bdfee752030c..867d7db11581b30517389b3b9f6045d04b683ce8 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2125,7 +2125,6 @@ source "mm/Kconfig"
 config SMP
        bool "Multi-Processing support"
        depends on SYS_SUPPORTS_SMP
-       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 6aaa1607001a42980c95a1984c7775bc5359826a..8bde9237d13bf3dca2ab111b35ba921f496baec3 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -181,7 +181,6 @@ endmenu
 config SMP
        bool "Symmetric multi-processing support"
        default y
-       select USE_GENERIC_SMP_HELPERS
        depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050
        ---help---
          This enables support for systems with more than one CPU. If you have

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 7dcde539d61e08b0bc586aa220b19ed31654c89c..c03567a9a91583a89ebd9dd24166afa7f586b64f 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -226,7 +226,6 @@ endchoice
 
 config SMP
        bool "Symmetric multi-processing support"
-       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2f898d63eb96ad4fb5b0cf0528aa69dfb54633cc..4740b0a15fa89b220dd3e36aa7a39b3f5d25dc02 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -106,7 +106,6 @@ config PPC
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
-       select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_OPROFILE
        select HAVE_DEBUG_KMEMLEAK
        select GENERIC_ATOMIC64 if PPC32

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f75d7e517927694c3782036c64de5842a4852d9d..314fced4fc14a50f2785d273c87fd590d241e9da 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -141,7 +141,6 @@ config S390
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
        select SYSCTL_EXCEPTION_TRACE
-       select USE_GENERIC_SMP_HELPERS if SMP
        select VIRT_CPU_ACCOUNTING
        select VIRT_TO_BUS
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 224f4bc9925ece7f38c85a145cf615aa78082569..e78561bc30ef2bc746d0ed9b12d5a163059c493e 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -711,7 +711,6 @@ config CC_STACKPROTECTOR
 config SMP
        bool "Symmetric multi-processing support"
        depends on SYS_SUPPORTS_SMP
-       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 78c4fdb91bc57a425e9fd5978260088ef5072d34..8591b201d9cc67931dbf15dc6d474e7f84ccf9ae 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -28,7 +28,6 @@ config SPARC
        select HAVE_ARCH_JUMP_LABEL
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_IPC_PARSE_VERSION
-       select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_PCI_IOMAP
        select HAVE_NMI_WATCHDOG if SPARC64
        select HAVE_BPF_JIT

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index d45a2c48f1850d65fe01a0c23a91eea1115fc1dd..b3692ce78f9034773415503017c2a4cb24fa1d2c 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -8,7 +8,6 @@ config TILE
        select HAVE_KVM if !TILEGX
        select GENERIC_FIND_FIRST_BIT
        select SYSCTL_EXCEPTION_TRACE
-       select USE_GENERIC_SMP_HELPERS
        select CC_OPTIMIZE_FOR_SIZE
        select HAVE_DEBUG_KMEMLEAK
        select GENERIC_IRQ_PROBE

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index af5513e5798a81e4504e0f7c229a5c434d12703e..83f521aa103fcfd447c2b9a90889f80fa859c9ea 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -90,7 +90,6 @@ config X86
        select GENERIC_IRQ_SHOW
        select GENERIC_CLOCKEVENTS_MIN_ADJUST
        select IRQ_FORCED_THREADING
-       select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_BPF_JIT if X86_64
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
        select CLKEVT_I8253

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 88d4e864d4c0f512a5f858f01651f71074937ec3..c661896e2465bd0f9248c85400be210b67efed76 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -319,7 +319,7 @@ void __blk_mq_end_io(struct request *rq, int error)
                blk_mq_complete_request(rq, error);
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+#if defined(CONFIG_SMP)
 
 /*
  * Called with interrupts disabled.
@@ -361,7 +361,7 @@ static int ipi_remote_cpu(struct blk_mq_ctx *ctx, const int cpu,
 
        return true;
 }
-#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */
+#else /* CONFIG_SMP */
 static int ipi_remote_cpu(struct blk_mq_ctx *ctx, const int cpu,
                          struct request *rq, const int error)
 {

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ce4b8bfd3d279b0e6dc219d722420368bf969b25..57790c1a97ebb2eeea4f6d97b0c6ef42aa93a3a5 100644 (file)
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -36,7 +36,7 @@ static void blk_done_softirq(struct softirq_action *h)
        }
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+#ifdef CONFIG_SMP
 static void trigger_softirq(void *data)
 {
        struct request *rq = data;
@@ -71,7 +71,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
 
        return 1;
 }
-#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */
+#else /* CONFIG_SMP */
 static int raise_blk_irq(int cpu, struct request *rq)
 {
        return 1;

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 4f8c4d90ec7350613d8de5a815326a337e875a6e..97779522472f8356d5b09e91a33b1b310293d230 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -288,7 +288,7 @@ static ssize_t
 queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)
 {
        ssize_t ret = -EINVAL;
-#if defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+#ifdef CONFIG_SMP
        unsigned long val;
 
        ret = queue_var_store(&val, page, count);

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 731f5237d5f4e0f87dd817e15983f509d3b4d483..78851513030daaea470607d88c67539ea40b1a5f 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -106,14 +106,10 @@ void kick_all_cpus_sync(void);
 /*
  * Generic and arch helpers
  */
-#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
 void __init call_function_init(void);
 void generic_smp_call_function_single_interrupt(void);
 #define generic_smp_call_function_interrupt \
        generic_smp_call_function_single_interrupt
-#else
-static inline void call_function_init(void) { }
-#endif
 
 /*
  * Mark the boot cpu "online" so that it can call console drivers in

diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 94fabd534b03d9347dc117b653204fa838283def..2a202a846757f238cccb290033633e5778bd3bb9 100644 (file)
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -55,4 +55,4 @@ config HZ
        default 1000 if HZ_1000
 
 config SCHED_HRTICK
-       def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)
+       def_bool HIGH_RES_TIMERS

diff --git a/kernel/smp.c b/kernel/smp.c
index 46116100f0ee2e9a74e45afff349d3420515df7a..1c194e20e94390da1ff297ee499d50ba77150233 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -15,7 +15,6 @@
 
 #include "smpboot.h"
 
-#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
 enum {
        CSD_FLAG_LOCK           = 0x01,
        CSD_FLAG_WAIT           = 0x02,
@@ -464,7 +463,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
        return 0;
 }
 EXPORT_SYMBOL(smp_call_function);
-#endif /* USE_GENERIC_SMP_HELPERS */
 
 /* Setup configured maximum number of CPUs to activate */
 unsigned int setup_max_cpus = NR_CPUS;