Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f618ef7c authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Jens Axboe
Browse files

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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d17ab459

block/blk-mq-cpu.c

+4 −4
Original line number Diff line number Diff line
@@ -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 void __cpuinit blk_mq_cpu_notify(void *data, unsigned long action,

static void blk_mq_cpu_notify(void *data, unsigned long action,

			      unsigned int cpu)

{

	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {

block/blk-mq.c

+3 −3
Original line number Diff line number Diff line
@@ -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,7 +1461,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;