commit fb573856b2d82926b36ed059899d883474a3b9eb
author Ken Chen <kenneth.w.chen@intel.com> Mon Aug 08 15:25:00 2005 -0700
committer Tony Luck <tony.luck@intel.com> Mon Aug 08 15:39:47 2005 -0700
tree 310364196ff73647fcdce8e5f3746e2538ad5b0b
parent 688d191821de7893043f5a37970472627aaffa4e

[IA64] fix nohalt boot option

this changeset broke the "nohalt" kernel boot option.
  8df5a500a3e97f7811cdce0f553ca1917ccd4220

default_idle() is looking at new variable can_do_pal_halt.  However,
that variable did not get cleared upon "nohalt" boot option.  Result
is that "nohalt" option is ignored until perfmon is exercised.

Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

arch/ia64/kernel/process.c

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 66e8406..051e050 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -179,7 +179,7 @@
 
 static int __init nohalt_setup(char * str)
 {
-	pal_halt = 0;
+	pal_halt = can_do_pal_halt = 0;
 	return 1;
 }
 __setup("nohalt", nohalt_setup);