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

git-mirror · Aug 9, 2005 · a7df26d · a7df26d
2 parents 68e681e + fb57385
commit a7df26d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);