diff --git a/[refs] b/[refs] index b3ecc32d6e67..b64a35458b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fca51d64c5baf64604bc1edc5c5f0e7ed176322f +refs/heads/master: a33dac26d42d6f156b3b05a929961bd8d904f6e2 diff --git a/trunk/block/blk-iopoll.c b/trunk/block/blk-iopoll.c index b9b32652292c..ca564202ed7a 100644 --- a/trunk/block/blk-iopoll.c +++ b/trunk/block/blk-iopoll.c @@ -202,7 +202,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self, local_irq_disable(); list_splice_init(&per_cpu(blk_cpu_iopoll, cpu), &__get_cpu_var(blk_cpu_iopoll)); - raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); + __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_enable(); }