From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 9 Aug 2005 23:03:19 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: tegra-9.12.3~27564
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=a7df26da158ad64d56cc32934aa38a07d03a6fc9;hp=68e681e87faa142bde356aeefe619c42275ac98e

Merge /pub/scm/linux/kernel/git/aegl/linux-2.6
---

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 66e84060980..051e050359e 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);