diff options
| author | Christoph Hellwig <hch@infradead.org> | 2013-11-14 14:32:07 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:56:59 +0200 |
| commit | eadfd4315866c2cbb076cfb6d3103456b0f55052 (patch) | |
| tree | f921c1fce88de3313699130342981942bf40e179 /block | |
| parent | 72474e6b91c5753a7384664b121844385923f16a (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>
[imaund@codeaurora.org: resolve merge conflicts]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-softirq.c | 4 | ||||
| -rw-r--r-- | block/blk-sysfs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c index 467c8de88..2b01c0b73 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; diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 5efc5a647..277bd218b 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -287,7 +287,7 @@ static ssize_t queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count) { ssize_t ret = -EINVAL; -#if defined(CONFIG_USE_GENERIC_SMP_HELPERS) +#ifdef CONFIG_SMP unsigned long val; ret = queue_var_store(&val, page, count); |