diff --git a/[refs] b/[refs]
index dd9b59bb09cf..ad302aa8d7f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15f827be93928890bba965bc175caee50c4406d2
+refs/heads/master: 0a8a2e78b7eece7c65884fcff9f98dc0fce89ee4
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 4eb3a0fa351e..5ace266bc0e6 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -297,7 +297,7 @@ void irq_enter(void)
 	int cpu = smp_processor_id();
 
 	rcu_irq_enter();
-	if (idle_cpu(cpu) && !in_interrupt()) {
+	if (is_idle_task(current) && !in_interrupt()) {
 		/*
 		 * Prevent raise_softirq from needlessly waking up ksoftirqd
 		 * here, as softirq will be serviced on return from interrupt.