Skip to contentSkip to conversation

block/blk-mq: remove newly added instances of __cpuinit

PATCH-next Paul Gortmaker 2 participants 2 messages Nov 7, 2013 – Nov 14, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

commit 320ae51feed5c2f13664aa05a76bec198967e04d [Nov7 linux-next via "Merge remote-tracking branch 'block/for-next'"] adds "blk-mq: new multi-queue block IO queueing mechanism". This commit 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.

---

[Feel free to squish this into the original commit if there happens
to be a rebase taking place for some other reason anyway... ]

 block/blk-mq-cpu.c | 4 ++--
 block/blk-mq.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
block/blk-mq-cpu.c +2 -2
index 4f0c352..7e48c97 100644
@@ -13,7 +13,7 @@
 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,
+static int blk_mq_main_cpu_notify(struct notifier_block *self,
 					    unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (unsigned long) hcpu;
@@ -28,7 +28,7 @@ static int __cpuinit blk_mq_main_cpu_notify(struct notifier_block *self,
 	return NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata blk_mq_main_cpu_notifier = {
+static struct notifier_block blk_mq_main_cpu_notifier = {
 	.notifier_call	= blk_mq_main_cpu_notify,
 };
 
block/blk-mq.c +2 -2
index 757b8d1..b1c1abc 100644
@@ -1403,7 +1403,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);
 
@@ -1420,7 +1420,7 @@ 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,
+static int blk_mq_queue_reinit_notify(struct notifier_block *nb,
 		unsigned long action, void *hcpu)
 {
 	struct request_queue *q;
Signature · 1 line
1.8.4.1
maintainer
#1 lore raw
Quoted 9 lines · Paul Gortmaker

commit 320ae51feed5c2f13664aa05a76bec198967e04d [Nov7 linux-next via "Merge remote-tracking branch 'block/for-next'"] adds "blk-mq: new multi-queue block IO queueing mechanism". This commit 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.

Thanks, added.

Signature · 1 line
Jens Axboe