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();