]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] fix nohalt boot option
authorKen Chen <kenneth.w.chen@intel.com>
Mon, 8 Aug 2005 22:25:00 +0000 (15:25 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 8 Aug 2005 22:39:47 +0000 (15:39 -0700)
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

index 66e8406098080343da5fa91e3f1b860d7e6ee5d7..051e050359e490ac4a5e44a90cb6c46849ea77f9 100644 (file)
@@ -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);