aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-05-03 19:21:45 -0400
committerTony Luck <tony.luck@intel.com>2005-05-03 19:21:45 -0400
commita71f62edc935fbdc346c5b16bea19f1480d29635 (patch)
treefce9b26a5a9e059735050415eab79fb06a24eae3 /arch/ia64/kernel
parenta5a70b75d93b26e14c0c5e759099d602a480b9e2 (diff)
[IA64] Fix two warnings introduced by perfmon patches.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r--arch/ia64/kernel/process.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 474d75f9de8a..ebb71f3d6d19 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -183,7 +183,7 @@ static int __init nohalt_setup(char * str)
183} 183}
184__setup("nohalt", nohalt_setup); 184__setup("nohalt", nohalt_setup);
185 185
186int 186void
187update_pal_halt_status(int status) 187update_pal_halt_status(int status)
188{ 188{
189 can_do_pal_halt = pal_halt && status; 189 can_do_pal_halt = pal_halt && status;
@@ -195,8 +195,6 @@ update_pal_halt_status(int status)
195void 195void
196default_idle (void) 196default_idle (void)
197{ 197{
198 int can_do_pal;
199
200 while (!need_resched()) 198 while (!need_resched())
201 if (can_do_pal_halt) 199 if (can_do_pal_halt)
202 safe_halt(); 200 safe_halt();