Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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>
Git-commit: 0a06ff068f1255bcd7965ab07bc0f4adc3eb639a
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[imaund@codeaurora.org: resolve merge conflicts]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
This commit is contained in:
Christoph Hellwig 2013-11-14 14:32:07 -08:00 committed by Michael Bohan
parent 10473d2135
commit d040642497
24 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/Kconfig
View File

@ -207,9 +207,6 @@ config HAVE_DMA_ATTRS
config HAVE_DMA_CONTIGUOUS config HAVE_DMA_CONTIGUOUS
bool bool
config USE_GENERIC_SMP_HELPERS
bool
config GENERIC_SMP_IDLE_THREAD config GENERIC_SMP_IDLE_THREAD
bool bool

1
arch/alpha/Kconfig
View File

@ -521,7 +521,6 @@ config ARCH_MAY_HAVE_PC_FDC
config SMP config SMP
bool "Symmetric multi-processing support" 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 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--- ---help---
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/arc/Kconfig
View File

@ -118,7 +118,6 @@ config ARC_PLAT_NEEDS_CPU_TO_DMA
config SMP config SMP
bool "Symmetric Multi-Processing (Incomplete)" bool "Symmetric Multi-Processing (Incomplete)"
default n default n
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/arm/Kconfig
View File

@ -1487,7 +1487,6 @@ config SMP
depends on GENERIC_CLOCKEVENTS depends on GENERIC_CLOCKEVENTS
depends on HAVE_SMP depends on HAVE_SMP
depends on MMU depends on MMU
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/arm64/Kconfig
View File

@ -169,7 +169,6 @@ config CPU_BIG_ENDIAN
config SMP config SMP
bool "Symmetric Multi-Processing" bool "Symmetric Multi-Processing"
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one CPU. If This enables support for systems with more than one CPU. If
you say N here, the kernel will run on single and you say N here, the kernel will run on single and

1
arch/blackfin/Kconfig
View File

@ -34,7 +34,6 @@ config BLACKFIN
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select USE_GENERIC_SMP_HELPERS if SMP
select HAVE_NMI_WATCHDOG if NMI_WATCHDOG select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
select GENERIC_SMP_IDLE_THREAD select GENERIC_SMP_IDLE_THREAD
select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS

1
arch/hexagon/Kconfig
View File

@ -4,7 +4,6 @@ comment "Linux Kernel Configuration for Hexagon"
config HEXAGON config HEXAGON
def_bool y def_bool y
select HAVE_OPROFILE select HAVE_OPROFILE
select USE_GENERIC_SMP_HELPERS if SMP
# Other pending projects/to-do items. # Other pending projects/to-do items.
# select HAVE_REGS_AND_STACK_ACCESS_API # select HAVE_REGS_AND_STACK_ACCESS_API
# select HAVE_HW_BREAKPOINT if PERF_EVENTS # select HAVE_HW_BREAKPOINT if PERF_EVENTS

1
arch/ia64/Kconfig
View File

@ -343,7 +343,6 @@ config FORCE_MAX_ZONEORDER
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, say N. If you have a system with more

1
arch/m32r/Kconfig
View File

@ -274,7 +274,6 @@ source "kernel/Kconfig.preempt"
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
select USE_GENERIC_SMP_HELPERS
---help--- ---help---
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/metag/Kconfig
View File

@ -110,7 +110,6 @@ config METAG_META21
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
depends on METAG_META21 && METAG_META21_MMU depends on METAG_META21 && METAG_META21_MMU
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one thread running This enables support for systems with more than one thread running
Linux. If you have a system with only one thread running Linux, Linux. If you have a system with only one thread running Linux,

1
arch/mips/Kconfig
View File

@ -2175,7 +2175,6 @@ source "mm/Kconfig"
config SMP config SMP
bool "Multi-Processing support" bool "Multi-Processing support"
depends on SYS_SUPPORTS_SMP depends on SYS_SUPPORTS_SMP
select USE_GENERIC_SMP_HELPERS
help help
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/mn10300/Kconfig
View File

@ -180,7 +180,6 @@ endmenu
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
default y default y
select USE_GENERIC_SMP_HELPERS
depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050 depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050
---help--- ---help---
This enables support for systems with more than one CPU. If you have This enables support for systems with more than one CPU. If you have

1
arch/parisc/Kconfig
View File

@ -225,7 +225,6 @@ endchoice
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
select USE_GENERIC_SMP_HELPERS
---help--- ---help---
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/powerpc/Kconfig
View File

@ -106,7 +106,6 @@ config PPC
select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_NODE_MAP
select HAVE_DMA_ATTRS select HAVE_DMA_ATTRS
select HAVE_DMA_API_DEBUG select HAVE_DMA_API_DEBUG
select USE_GENERIC_SMP_HELPERS if SMP
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select GENERIC_ATOMIC64 if PPC32 select GENERIC_ATOMIC64 if PPC32

1
arch/s390/Kconfig
View File

@ -140,7 +140,6 @@ config S390
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
select OLD_SIGACTION select OLD_SIGACTION
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select USE_GENERIC_SMP_HELPERS if SMP
select VIRT_CPU_ACCOUNTING select VIRT_CPU_ACCOUNTING
config SCHED_OMIT_FRAME_POINTER config SCHED_OMIT_FRAME_POINTER

1
arch/sh/Kconfig
View File

@ -711,7 +711,6 @@ config CC_STACKPROTECTOR
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
depends on SYS_SUPPORTS_SMP depends on SYS_SUPPORTS_SMP
select USE_GENERIC_SMP_HELPERS
---help--- ---help---
This enables support for systems with more than one CPU. If you have 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 a system with only one CPU, like most personal computers, say N. If

1
arch/sparc/Kconfig
View File

@ -28,7 +28,6 @@ config SPARC
select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_JUMP_LABEL
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select USE_GENERIC_SMP_HELPERS if SMP
select GENERIC_PCI_IOMAP select GENERIC_PCI_IOMAP
select HAVE_NMI_WATCHDOG if SPARC64 select HAVE_NMI_WATCHDOG if SPARC64
select HAVE_BPF_JIT select HAVE_BPF_JIT

1
arch/tile/Kconfig
View File

@ -8,7 +8,6 @@ config TILE
select HAVE_KVM if !TILEGX select HAVE_KVM if !TILEGX
select GENERIC_FIND_FIRST_BIT select GENERIC_FIND_FIRST_BIT
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select USE_GENERIC_SMP_HELPERS
select CC_OPTIMIZE_FOR_SIZE select CC_OPTIMIZE_FOR_SIZE
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE

1
arch/x86/Kconfig
View File

@ -89,7 +89,6 @@ config X86
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_CLOCKEVENTS_MIN_ADJUST select GENERIC_CLOCKEVENTS_MIN_ADJUST
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select USE_GENERIC_SMP_HELPERS if SMP
select HAVE_BPF_JIT if X86_64 select HAVE_BPF_JIT if X86_64
select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE
select CLKEVT_I8253 select CLKEVT_I8253

4
block/blk-softirq.c
View File

@ -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) static void trigger_softirq(void *data)
{ {
struct request *rq = data; struct request *rq = data;
@ -71,7 +71,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
return 1; return 1;
} }
#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ #else /* CONFIG_SMP */
static int raise_blk_irq(int cpu, struct request *rq) static int raise_blk_irq(int cpu, struct request *rq)
{ {
return 1; return 1;

2
block/blk-sysfs.c
View File

@ -287,7 +287,7 @@ static ssize_t
queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count) queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)
{ {
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
#if defined(CONFIG_USE_GENERIC_SMP_HELPERS) #ifdef CONFIG_SMP
unsigned long val; unsigned long val;
ret = queue_var_store(&val, page, count); ret = queue_var_store(&val, page, count);

4
include/linux/smp.h
View File

@ -86,14 +86,10 @@ void kick_all_cpus_sync(void);
/* /*
* Generic and arch helpers * Generic and arch helpers
*/ */
#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
void __init call_function_init(void); void __init call_function_init(void);
void generic_smp_call_function_single_interrupt(void); void generic_smp_call_function_single_interrupt(void);
#define generic_smp_call_function_interrupt \ #define generic_smp_call_function_interrupt \
generic_smp_call_function_single_interrupt generic_smp_call_function_single_interrupt
#else
static inline void call_function_init(void) { }
#endif
/* /*
* Call a function on all processors * Call a function on all processors

2
kernel/Kconfig.hz
View File

@ -55,4 +55,4 @@ config HZ
default 1000 if HZ_1000 default 1000 if HZ_1000
config SCHED_HRTICK config SCHED_HRTICK
def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS) def_bool HIGH_RES_TIMERS

2
kernel/smp.c
View File

@ -15,7 +15,6 @@
#include "smpboot.h" #include "smpboot.h"
#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
enum { enum {
CSD_FLAG_LOCK = 0x01, CSD_FLAG_LOCK = 0x01,
}; };
@ -470,7 +469,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
return 0; return 0;
} }
EXPORT_SYMBOL(smp_call_function); EXPORT_SYMBOL(smp_call_function);
#endif /* USE_GENERIC_SMP_HELPERS */
/* Setup configured maximum number of CPUs to activate */ /* Setup configured maximum number of CPUs to activate */
unsigned int setup_max_cpus = NR_CPUS; unsigned int setup_max_cpus = NR_CPUS;