Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 9 Aug 2005 23:03:19 +0000 (16:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 9 Aug 2005 23:03:19 +0000 (16:03 -0700)
arch/ia64/kernel/process.c

index 66e8406098080343da5fa91e3f1b860d7e6ee5d7..051e050359e490ac4a5e44a90cb6c46849ea77f9 100644 (file)
@@ -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);