diff options
| author | Christoph Hellwig <hch@infradead.org> | 2013-11-14 14:32:07 -0800 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-04-30 15:04:26 +0530 |
| commit | a8903dea8b86f0d200f132ad70a4c8368d02dba7 (patch) | |
| tree | cdb9ea2a4fed51112bf0713639d5389af5410746 /block/blk-softirq.c | |
| parent | 17cfe155aed3ec0e735644fe638f6613ed5e8070 (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.
Conflicts:
arch/arm/Kconfig
block/blk-mq.c
Change-Id: Ic19c3ac07a38a1636d6aa2fed5e55a58833f9b2c
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>
(cherry picked from commit 0a06ff068f1255bcd7965ab07bc0f4adc3eb639a)
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
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 467c8de88642..2b01c0b73984 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; |