From 3af36aecb82283813bc86c6dd2f88e97767a0eae Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 29 Mar 2013 11:02:30 -0700
Subject: [PATCH] --- yaml --- r: 361946 b: refs/heads/master c:
 ed176886b68fbc450ddbe808684a142fcad72b56 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/process.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fbdee2c93979..bea6f9ec7190 100644
--- 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
index e34f565f595a..6f7dc8b7b35c 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -291,7 +291,6 @@ cpu_idle (void)
 		}
 
 		if (!need_resched()) {
-			void (*idle)(void);
 #ifdef CONFIG_SMP
 			min_xtp();
 #endif
@@ -299,9 +298,7 @@ cpu_idle (void)
 			if (mark_idle)
 				(*mark_idle)(1);
 
-			if (!idle)
-				idle = default_idle;
-			(*idle)();
+			default_idle();
 			if (mark_idle)
 				(*mark_idle)(0);
 #ifdef CONFIG_SMP