aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2013-11-14 17:32:07 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 19:32:22 -0500
commit0a06ff068f1255bcd7965ab07bc0f4adc3eb639a (patch)
tree419618fc4573c9d0ff17f383e84fc41071d50004 /kernel
parentfc21c0cff2f425891b28ff6fb6b03b325c977428 (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Kconfig.hz2
-rw-r--r--kernel/smp.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 94fabd534b03..2a202a846757 100644
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -55,4 +55,4 @@ config HZ
55 default 1000 if HZ_1000 55 default 1000 if HZ_1000
56 56
57config SCHED_HRTICK 57config SCHED_HRTICK
58 def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS) 58 def_bool HIGH_RES_TIMERS
diff --git a/kernel/smp.c b/kernel/smp.c
index 46116100f0ee..1c194e20e943 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -15,7 +15,6 @@
15 15
16#include "smpboot.h" 16#include "smpboot.h"
17 17
18#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
19enum { 18enum {
20 CSD_FLAG_LOCK = 0x01, 19 CSD_FLAG_LOCK = 0x01,
21 CSD_FLAG_WAIT = 0x02, 20 CSD_FLAG_WAIT = 0x02,
@@ -464,7 +463,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
464 return 0; 463 return 0;
465} 464}
466EXPORT_SYMBOL(smp_call_function); 465EXPORT_SYMBOL(smp_call_function);
467#endif /* USE_GENERIC_SMP_HELPERS */
468 466
469/* Setup configured maximum number of CPUs to activate */ 467/* Setup configured maximum number of CPUs to activate */
470unsigned int setup_max_cpus = NR_CPUS; 468unsigned int setup_max_cpus = NR_CPUS;