diff options
| author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2013-11-21 17:32:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-21 19:42:27 -0500 |
| commit | 044c8d4b15743f6e0a4cb6f2aeb32745a116ebff (patch) | |
| tree | a2c825429045946a9fdaea86b9ff5a0cf350e21a | |
| parent | a399b29dfbaaaf91162b2dc5a5875dd51bbfa2a1 (diff) | |
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff068f12
("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>
| -rw-r--r-- | drivers/block/null_blk.c | 8 | ||||
| -rw-r--r-- | net/Kconfig | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index b5d842370cc9..ea192ec029c4 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c | |||
| @@ -223,7 +223,7 @@ static void null_softirq_done_fn(struct request *rq) | |||
| 223 | blk_end_request_all(rq, 0); | 223 | blk_end_request_all(rq, 0); |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | #if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) | 226 | #ifdef CONFIG_SMP |
| 227 | 227 | ||
| 228 | static void null_ipi_cmd_end_io(void *data) | 228 | static void null_ipi_cmd_end_io(void *data) |
| 229 | { | 229 | { |
| @@ -260,7 +260,7 @@ static void null_cmd_end_ipi(struct nullb_cmd *cmd) | |||
| 260 | put_cpu(); | 260 | put_cpu(); |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | #endif /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ | 263 | #endif /* CONFIG_SMP */ |
| 264 | 264 | ||
| 265 | static inline void null_handle_cmd(struct nullb_cmd *cmd) | 265 | static inline void null_handle_cmd(struct nullb_cmd *cmd) |
| 266 | { | 266 | { |
| @@ -270,7 +270,7 @@ static inline void null_handle_cmd(struct nullb_cmd *cmd) | |||
| 270 | end_cmd(cmd); | 270 | end_cmd(cmd); |
| 271 | break; | 271 | break; |
| 272 | case NULL_IRQ_SOFTIRQ: | 272 | case NULL_IRQ_SOFTIRQ: |
| 273 | #if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) | 273 | #ifdef CONFIG_SMP |
| 274 | null_cmd_end_ipi(cmd); | 274 | null_cmd_end_ipi(cmd); |
| 275 | #else | 275 | #else |
| 276 | end_cmd(cmd); | 276 | end_cmd(cmd); |
| @@ -571,7 +571,7 @@ static int __init null_init(void) | |||
| 571 | { | 571 | { |
| 572 | unsigned int i; | 572 | unsigned int i; |
| 573 | 573 | ||
| 574 | #if !defined(CONFIG_SMP) || !defined(CONFIG_USE_GENERIC_SMP_HELPERS) | 574 | #if !defined(CONFIG_SMP) |
| 575 | if (irqmode == NULL_IRQ_SOFTIRQ) { | 575 | if (irqmode == NULL_IRQ_SOFTIRQ) { |
| 576 | pr_warn("null_blk: softirq completions not available.\n"); | 576 | pr_warn("null_blk: softirq completions not available.\n"); |
| 577 | pr_warn("null_blk: using direct completions.\n"); | 577 | pr_warn("null_blk: using direct completions.\n"); |
diff --git a/net/Kconfig b/net/Kconfig index 0715db64a5c3..d334678c0bd8 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -224,7 +224,7 @@ source "net/hsr/Kconfig" | |||
| 224 | 224 | ||
| 225 | config RPS | 225 | config RPS |
| 226 | boolean | 226 | boolean |
| 227 | depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS | 227 | depends on SMP && SYSFS |
| 228 | default y | 228 | default y |
| 229 | 229 | ||
| 230 | config RFS_ACCEL | 230 | config RFS_ACCEL |
| @@ -235,7 +235,7 @@ config RFS_ACCEL | |||
| 235 | 235 | ||
| 236 | config XPS | 236 | config XPS |
| 237 | boolean | 237 | boolean |
| 238 | depends on SMP && USE_GENERIC_SMP_HELPERS | 238 | depends on SMP |
| 239 | default y | 239 | default y |
| 240 | 240 | ||
| 241 | config NETPRIO_CGROUP | 241 | config NETPRIO_CGROUP |