From: Tony Luck <tony.luck@intel.com>
Date: Tue, 3 May 2005 23:21:45 +0000 (-0700)
Subject: [IA64] Fix two warnings introduced by perfmon patches.
X-Git-Tag: v2.6.12-rc4~117^2~5^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a71f62edc935fbdc346c5b16bea19f1480d29635;p=linux-2.6-omap-h63xx.git

[IA64] Fix two warnings introduced by perfmon patches.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 474d75f9de8..ebb71f3d6d1 100644
--- a/arch/ia64/kernel/process.c
+++ b/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();