aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-softirq.c
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 /block/blk-softirq.c
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 'block/blk-softirq.c')
-rw-r--r--block/blk-softirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ce4b8bfd3d27..57790c1a97eb 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -36,7 +36,7 @@ static void blk_done_softirq(struct softirq_action *h)
36 } 36 }
37} 37}
38 38
39#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) 39#ifdef CONFIG_SMP
40static void trigger_softirq(void *data) 40static void trigger_softirq(void *data)
41{ 41{
42 struct request *rq = data; 42 struct request *rq = data;
@@ -71,7 +71,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
71 71
72 return 1; 72 return 1;
73} 73}
74#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ 74#else /* CONFIG_SMP */
75static int raise_blk_irq(int cpu, struct request *rq) 75static int raise_blk_irq(int cpu, struct request *rq)
76{ 76{
77 return 1; 77 return 1;