summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-11 00:56:08 -0400
committerLen Brown <len.brown@intel.com>2005-08-11 00:56:08 -0400
commit95f193aa4fe50eb2dc987081d066edd6e13027de (patch)
tree1bf995f6290ef824ea8571520de815379d0478a3 /arch/ia64
parente872d4cace8681838e8d18d52c92f4870e980a08 (diff)
parentbc68552faad0e134eb22281343d5ae5a4873fa80 (diff)
Merge ../to-linus
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 66e840609808..051e050359e4 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -179,7 +179,7 @@ static int can_do_pal_halt = 1;
static int __init nohalt_setup(char * str)
{
- pal_halt = 0;
+ pal_halt = can_do_pal_halt = 0;
return 1;
}
__setup("nohalt", nohalt_setup);