---

yaml --- r: 361946 b: refs/heads/master c: ed17688 h: refs/heads/master v: v3
git-mirror · Mar 29, 2013 · 3af36ae · 3af36ae
1 parent 0682689
commit 3af36ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e17c1100d741469ce22c09ba98b55fc2aaad50
+refs/heads/master: ed176886b68fbc450ddbe808684a142fcad72b56
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
@@ -291,17 +291,14 @@ cpu_idle (void)
 		}
 
 		if (!need_resched()) {
-			void (*idle)(void);
 #ifdef CONFIG_SMP
 			min_xtp();
 #endif
 			rmb();
 			if (mark_idle)
 				(*mark_idle)(1);
 
-			if (!idle)
-				idle = default_idle;
-			(*idle)();
+			default_idle();
 			if (mark_idle)
 				(*mark_idle)(0);
 #ifdef CONFIG_SMP