path: root/block/blk-softirq.c
diff options
authorPaul Gortmaker <>2013-06-19 15:26:23 -0400
committerPaul Gortmaker <>2013-07-14 19:36:59 -0400
commit0b776b062843b63cb4c9acdfc092b2581be3c2f6 (patch)
tree18fd65bcac736087793329fda9211cfa3fd78501 /block/blk-softirq.c
parenta83048ebd449a441fdbd3fa854e6b1a71552cc99 (diff)
block: delete __cpuinit usage from all block files
The __cpuinit type of throwaway sections might have made sense some time ago when RAM was more constrained, but now the savings do not offset the cost and complications. For example, the fix in commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time") is a good example of the nasty type of bugs that can be created with improper use of the various __init prefixes. After a discussion on LKML[1] it was decided that cpuinit should go the way of devinit and be phased out. Once all the users are gone, we can then finally remove the macros themselves from linux/init.h. This removes all the drivers/block uses of the __cpuinit macros from all C files. [1] Cc: Jens Axboe <> Signed-off-by: Paul Gortmaker <>
Diffstat (limited to 'block/blk-softirq.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 467c8de..ec9e606 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -78,8 +78,8 @@ static int raise_blk_irq(int cpu, struct request *rq)
-static int __cpuinit blk_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
* If a CPU goes away, splice its entries to the current CPU
@@ -98,7 +98,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
-static struct notifier_block __cpuinitdata blk_cpu_notifier = {
+static struct notifier_block blk_cpu_notifier = {
.notifier_call = blk_cpu_notify,