diff options
author | Ken Chen <kenneth.w.chen@intel.com> | 2005-08-08 18:25:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-08-08 18:39:47 -0400 |
commit | fb573856b2d82926b36ed059899d883474a3b9eb (patch) | |
tree | 310364196ff73647fcdce8e5f3746e2538ad5b0b | |
parent | 688d191821de7893043f5a37970472627aaffa4e (diff) |
[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>
-rw-r--r-- | arch/ia64/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 66e840609808..051e050359e4 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -179,7 +179,7 @@ static int can_do_pal_halt = 1; | |||
179 | 179 | ||
180 | static int __init nohalt_setup(char * str) | 180 | static int __init nohalt_setup(char * str) |
181 | { | 181 | { |
182 | pal_halt = 0; | 182 | pal_halt = can_do_pal_halt = 0; |
183 | return 1; | 183 | return 1; |
184 | } | 184 | } |
185 | __setup("nohalt", nohalt_setup); | 185 | __setup("nohalt", nohalt_setup); |