diff --git a/[refs] b/[refs]
index 2fccbbfcdaee..ae047dd1ff91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 978b0116cd225682a29e3d1d5010319bf2de32c2
+refs/heads/master: 8e85b4b553fc932e1c5141feb5fda389b7f5db01
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 82e32aadedd8..1cf1e2f2c406 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -205,7 +205,18 @@ asmlinkage void __do_softirq(void)
 
 	do {
 		if (pending & 1) {
+			int prev_count = preempt_count();
+
 			h->action(h);
+
+			if (unlikely(prev_count != preempt_count())) {
+				printk(KERN_ERR "huh, entered sotfirq %ld %p"
+				       "with preempt_count %08x,"
+				       " exited with %08x?\n", h - softirq_vec,
+				       h->action, prev_count, preempt_count());
+				preempt_count() = prev_count;
+			}
+
 			rcu_bh_qsctr_inc(cpu);
 		}
 		h++;