summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 16:03:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 16:03:19 -0700
commita7df26da158ad64d56cc32934aa38a07d03a6fc9 (patch)
treebe7cf42be9e84df58332c16db91526f818da020b /arch
parent68e681e87faa142bde356aeefe619c42275ac98e (diff)
parentfb573856b2d82926b36ed059899d883474a3b9eb (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
-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);