Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

a7df26da · Linus Torvalds · 68e681e8 · fb573856 · a7df26da
Commit a7df26da authored Aug 09, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/ia64/kernel/process.c arch/ia64/kernel/process.c +1 -1

No files found.
--- 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);