diff options
author | Christoph Hellwig <hch@infradead.org> | 2013-11-14 17:32:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:22 -0500 |
commit | 0a06ff068f1255bcd7965ab07bc0f4adc3eb639a (patch) | |
tree | 419618fc4573c9d0ff17f383e84fc41071d50004 /block/blk-mq.c | |
parent | fc21c0cff2f425891b28ff6fb6b03b325c977428 (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-mq.c')
-rw-r--r-- | block/blk-mq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 88d4e864d4c0..c661896e2465 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -319,7 +319,7 @@ void __blk_mq_end_io(struct request *rq, int error) | |||
319 | blk_mq_complete_request(rq, error); | 319 | blk_mq_complete_request(rq, error); |
320 | } | 320 | } |
321 | 321 | ||
322 | #if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS) | 322 | #if defined(CONFIG_SMP) |
323 | 323 | ||
324 | /* | 324 | /* |
325 | * Called with interrupts disabled. | 325 | * Called with interrupts disabled. |
@@ -361,7 +361,7 @@ static int ipi_remote_cpu(struct blk_mq_ctx *ctx, const int cpu, | |||
361 | 361 | ||
362 | return true; | 362 | return true; |
363 | } | 363 | } |
364 | #else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */ | 364 | #else /* CONFIG_SMP */ |
365 | static int ipi_remote_cpu(struct blk_mq_ctx *ctx, const int cpu, | 365 | static int ipi_remote_cpu(struct blk_mq_ctx *ctx, const int cpu, |
366 | struct request *rq, const int error) | 366 | struct request *rq, const int error) |
367 | { | 367 | { |