From 4810f8690a037318ef70bb9ce46cbc92110c9ecc Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Tue, 3 May 2005 16:21:45 -0700
Subject: [PATCH] --- yaml --- r: 923 b: refs/heads/master c:
 a71f62edc935fbdc346c5b16bea19f1480d29635 h: refs/heads/master i:   921:
 3f56d40c80c2ab74f6b8018002361767aa842f1d   919:
 6c7dfa0bdf699ba92f25de701b31dd5704ff973d v: v3

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

diff --git a/[refs] b/[refs]
index e590285e38c1..e04a2c5cd4f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5a70b75d93b26e14c0c5e759099d602a480b9e2
+refs/heads/master: a71f62edc935fbdc346c5b16bea19f1480d29635
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
index 474d75f9de8a..ebb71f3d6d19 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -183,7 +183,7 @@ static int __init nohalt_setup(char * str)
 }
 __setup("nohalt", nohalt_setup);
 
-int
+void
 update_pal_halt_status(int status)
 {
 	can_do_pal_halt = pal_halt && status;
@@ -195,8 +195,6 @@ update_pal_halt_status(int status)
 void
 default_idle (void)
 {
-	int can_do_pal;
-
 	while (!need_resched())
 		if (can_do_pal_halt)
 			safe_halt();