diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /arch/ia64/kernel/process.c | |
| parent | f241be74b803dcf9d70c9978292946370654320f (diff) | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/process.c')
| -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); |