From: Ken Chen <kenneth.w.chen@intel.com>
Date: Mon, 8 Aug 2005 22:25:00 +0000 (-0700)
Subject: [IA64] fix nohalt boot option
X-Git-Tag: v2.6.13-rc7~116^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fb573856b2d82926b36ed059899d883474a3b9eb;p=linux-2.6-omap-h63xx.git

[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>
---

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);