X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fblk-softirq.c;fp=block%2Fblk-softirq.c;h=57790c1a97ebb2eeea4f6d97b0c6ef42aa93a3a5;hb=0a06ff068f1255bcd7965ab07bc0f4adc3eb639a;hp=ce4b8bfd3d279b0e6dc219d722420368bf969b25;hpb=fc21c0cff2f425891b28ff6fb6b03b325c977428;p=~andy%2Flinux

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ce4b8bfd3d2..57790c1a97e 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -36,7 +36,7 @@ static void blk_done_softirq(struct softirq_action *h)
 	}
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+#ifdef CONFIG_SMP
 static void trigger_softirq(void *data)
 {
 	struct request *rq = data;
@@ -71,7 +71,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
 
 	return 1;
 }
-#else /* CONFIG_SMP && CONFIG_USE_GENERIC_SMP_HELPERS */
+#else /* CONFIG_SMP */
 static int raise_blk_irq(int cpu, struct request *rq)
 {
 	return 1;