lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly

Browse Source 
Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff068f
("kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS").

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yuanhan Liu
2013-11-21 14:32:01 -08:00
committed by Linus Torvalds
parent a399b29dfb
commit 044c8d4b15
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/null_blk.c
View File

@@ -223,7 +223,7 @@ static void null_softirq_done_fn(struct request *rq)
blk_end_request_all(rq, 0); blk_end_request_all(rq, 0);
} }
#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) #ifdef CONFIG_SMP
static void null_ipi_cmd_end_io(void *data) static void null_ipi_cmd_end_io(void *data)
{ {
@@ -260,7 +260,7 @@ static void null_cmd_end_ipi(struct nullb_cmd *cmd)
put_cpu(); put_cpu();
} }
#endif /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ #endif /* CONFIG_SMP */
static inline void null_handle_cmd(struct nullb_cmd *cmd) static inline void null_handle_cmd(struct nullb_cmd *cmd)
{ {
@@ -270,7 +270,7 @@ static inline void null_handle_cmd(struct nullb_cmd *cmd)
end_cmd(cmd); end_cmd(cmd);
break; break;
case NULL_IRQ_SOFTIRQ: case NULL_IRQ_SOFTIRQ:
#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) #ifdef CONFIG_SMP
null_cmd_end_ipi(cmd); null_cmd_end_ipi(cmd);
#else #else
end_cmd(cmd); end_cmd(cmd);
@@ -571,7 +571,7 @@ static int __init null_init(void)
{ {
unsigned int i; unsigned int i;
#if !defined(CONFIG_SMP) || !defined(CONFIG_USE_GENERIC_SMP_HELPERS) #if !defined(CONFIG_SMP)
if (irqmode == NULL_IRQ_SOFTIRQ) { if (irqmode == NULL_IRQ_SOFTIRQ) {
pr_warn("null_blk: softirq completions not available.\n"); pr_warn("null_blk: softirq completions not available.\n");
pr_warn("null_blk: using direct completions.\n"); pr_warn("null_blk: using direct completions.\n");

4
net/Kconfig
View File

@@ -224,7 +224,7 @@ source "net/hsr/Kconfig"
config RPS config RPS
boolean boolean
depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS depends on SMP && SYSFS
default y default y
config RFS_ACCEL config RFS_ACCEL
@@ -235,7 +235,7 @@ config RFS_ACCEL
config XPS config XPS
boolean boolean
depends on SMP && USE_GENERIC_SMP_HELPERS depends on SMP
default y default y
config NETPRIO_CGROUP config NETPRIO_CGROUP