---

yaml --- r: 360758 b: refs/heads/master c: af7bdba h: refs/heads/master v: v3
git-mirror · Feb 21, 2013 · 7e6bfe4 · 7e6bfe4
1 parent 1dc9785
commit 7e6bfe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: facd8b80c67a3cf64a467c4a2ac5fb31f2e6745b
+refs/heads/master: af7bdbafe3812af406ce07631effd2b96aae2dba
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
@@ -565,19 +565,14 @@ void tick_nohz_idle_enter(void)
  */
 void tick_nohz_irq_exit(void)
 {
-	unsigned long flags;
 	struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
 
 	if (!ts->inidle)
 		return;
 
-	local_irq_save(flags);
-
-	/* Cancel the timer because CPU already waken up from the C-states */
+	/* Cancel the timer because CPU already waken up from the C-states*/
 	menu_hrtimer_cancel();
 	__tick_nohz_idle_enter(ts);
-
-	local_irq_restore(flags);
 }
 
 /**