diff options
| author | Christoph Hellwig <hch@infradead.org> | 2013-11-14 23:32:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 01:32:22 +0100 |
| commit | 0a06ff068f1255bcd7965ab07bc0f4adc3eb639a (patch) | |
| tree | 419618fc4573c9d0ff17f383e84fc41071d50004 /block/blk-softirq.c | |
| parent | revert "softirq: Add support for triggering softirq work on softirqs" (diff) | |
| download | linux-0a06ff068f1255bcd7965ab07bc0f4adc3eb639a.tar.xz linux-0a06ff068f1255bcd7965ab07bc0f4adc3eb639a.zip | |
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.c | 4 |
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) } } -#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) +#ifdef CONFIG_SMP static void trigger_softirq(void *data) { struct request *rq = data; @@ -71,7 +71,7 @@ static int raise_blk_irq(int cpu, struct request *rq) return 1; } -#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ +#else /* CONFIG_SMP */ static int raise_blk_irq(int cpu, struct request *rq) { return 1; |