| commit | a7df26da158ad64d56cc32934aa38a07d03a6fc9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Aug 09 16:03:19 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Aug 09 16:03:19 2005 -0700 |
| tree | be7cf42be9e84df58332c16db91526f818da020b | |
| parent | 68e681e87faa142bde356aeefe619c42275ac98e [diff] | |
| parent | fb573856b2d82926b36ed059899d883474a3b9eb [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
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);