diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /arch/ia64/kernel/process.c | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/process.c')
| -rw-r--r-- | arch/ia64/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 6e35bff05d59..e484910246ad 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
| @@ -196,6 +196,7 @@ update_pal_halt_status(int status) | |||
| 196 | void | 196 | void |
| 197 | default_idle (void) | 197 | default_idle (void) |
| 198 | { | 198 | { |
| 199 | local_irq_enable(); | ||
| 199 | while (!need_resched()) | 200 | while (!need_resched()) |
| 200 | if (can_do_pal_halt) | 201 | if (can_do_pal_halt) |
| 201 | safe_halt(); | 202 | safe_halt(); |