diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-11-14 08:26:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-11-14 08:26:02 -0700 |
| commit | f618ef7c47934d1686a764d0c9f70f23e566683f (patch) | |
| tree | 61eb2bdac3d7e9f36ef68fab4c09b04b5730e879 /block | |
| parent | d17ab4592760973d95961bb29f26969246e9dabc (diff) | |
| download | linux-next-f618ef7c47934d1686a764d0c9f70f23e566683f.tar.gz | |
blk-mq: remove newly added instances of __cpuinit
The new blk-mq code added new instances of __cpuinit usage.
We removed this a couple versions ago; we now want to remove
the compat no-op stubs. Introducing new users is not what
we want to see at this point in time, as it will break once
the stubs are gone.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-cpu.c | 8 | ||||
| -rw-r--r-- | block/blk-mq.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/block/blk-mq-cpu.c b/block/blk-mq-cpu.c index f8ea39d7ae54..0045ace9bdf0 100644 --- a/block/blk-mq-cpu.c +++ b/block/blk-mq-cpu.c @@ -13,8 +13,8 @@ static LIST_HEAD(blk_mq_cpu_notify_list); static DEFINE_SPINLOCK(blk_mq_cpu_notify_lock); -static int __cpuinit blk_mq_main_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) +static int blk_mq_main_cpu_notify(struct notifier_block *self, + unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long) hcpu; struct blk_mq_cpu_notifier *notify; @@ -28,8 +28,8 @@ static int __cpuinit blk_mq_main_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } -static void __cpuinit blk_mq_cpu_notify(void *data, unsigned long action, - unsigned int cpu) +static void blk_mq_cpu_notify(void *data, unsigned long action, + unsigned int cpu) { if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) { /* diff --git a/block/blk-mq.c b/block/blk-mq.c index 88d4e864d4c0..3638a58c7645 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1444,7 +1444,7 @@ void blk_mq_free_queue(struct request_queue *q) EXPORT_SYMBOL(blk_mq_free_queue); /* Basically redo blk_mq_init_queue with queue frozen */ -static void __cpuinit blk_mq_queue_reinit(struct request_queue *q) +static void blk_mq_queue_reinit(struct request_queue *q) { blk_mq_freeze_queue(q); @@ -1461,8 +1461,8 @@ static void __cpuinit blk_mq_queue_reinit(struct request_queue *q) blk_mq_unfreeze_queue(q); } -static int __cpuinit blk_mq_queue_reinit_notify(struct notifier_block *nb, - unsigned long action, void *hcpu) +static int blk_mq_queue_reinit_notify(struct notifier_block *nb, + unsigned long action, void *hcpu) { struct request_queue *q; |