diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-14 16:05:09 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-14 16:05:09 +1100 |
commit | 56dfc04df0282dcc07c844d1b40ac099941c46de (patch) | |
tree | 2340e8d856a3b425d1ca7b6c955afe7c90d31c77 /block/blk-mq-cpu.c | |
parent | d04b1d6b127508c574d0bdba11d5ed9dc8630c35 (diff) | |
parent | af6c8e7769adb51147bf8844df36627bcb30b59c (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'block/blk-mq-cpu.c')
-rw-r--r-- | block/blk-mq-cpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/block/blk-mq-cpu.c b/block/blk-mq-cpu.c index 20576e3476e9..3146befb56aa 100644 --- a/block/blk-mq-cpu.c +++ b/block/blk-mq-cpu.c @@ -28,10 +28,6 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } -static struct notifier_block __cpuinitdata blk_mq_main_cpu_notifier = { - .notifier_call = blk_mq_main_cpu_notify, -}; - void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier) { BUG_ON(!notifier->notify); @@ -58,5 +54,5 @@ void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier, void __init blk_mq_cpu_init(void) { - register_hotcpu_notifier(&blk_mq_main_cpu_notifier); + hotcpu_notifier(blk_mq_main_cpu_notify, 0); } |