From 191d4cac7580ff233196edbe20ea846f72bef5d6 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 22 Feb 2013 00:05:07 +0100
Subject: [PATCH] --- yaml --- r: 360759 b: refs/heads/master c:
 4d4c4e24cf48400a24d33feffc7cca4f4e8cabe1 h: refs/heads/master i:   360757:
 1dc9785869821a94d0ddb568b22788ea9b57d599   360755:
 4c6284d7732fa3a42d4ae5d6fc9203b421bfec4a   360751:
 1d54ae2ab35ec6b084a369c788672f20d39ba521 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hardirq.h | 2 --
 trunk/kernel/softirq.c        | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d92bf01fb1f8..4f1d2dfde168 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7bdbafe3812af406ce07631effd2b96aae2dba
+refs/heads/master: 4d4c4e24cf48400a24d33feffc7cca4f4e8cabe1
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 29eb805ea4a6..c1d6555d2567 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -118,10 +118,8 @@
 
 #ifdef CONFIG_PREEMPT_COUNT
 # define preemptible()	(preempt_count() == 0 && !irqs_disabled())
-# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
 #else
 # define preemptible()	0
-# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
 #endif
 
 #if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 24a921bcf04f..f42ff97e1f8f 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -343,7 +343,7 @@ void irq_exit(void)
 
 	account_irq_exit_time(current);
 	trace_hardirq_exit();
-	sub_preempt_count(IRQ_EXIT_OFFSET);
+	sub_preempt_count(HARDIRQ_OFFSET);
 	if (!in_interrupt() && local_softirq_pending())
 		invoke_softirq();
 
@@ -353,7 +353,6 @@ void irq_exit(void)
 		tick_nohz_irq_exit();
 #endif
 	rcu_irq_exit();
-	sched_preempt_enable_no_resched();
 #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED
 	local_irq_restore(flags);
 #endif