diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2005-04-18 23:06:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 00:10:20 -0400 |
| commit | 6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b (patch) | |
| tree | 1d2cd6e75a4330039ddac768a1d71518f9476c67 /arch/ia64 | |
| parent | ef7b06cd905424aea7c31f27fef622e84e75e650 (diff) | |
| download | linux-stable-6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b.tar.gz linux-stable-6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b.tar.bz2 linux-stable-6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b.zip | |
[ACPI] fix C1 patch for IA64
http://bugzilla.kernel.org/show_bug.cgi?id=4233
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/process.c | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/setup.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index ebb71f3d6d19..a9bfba46733d 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -195,6 +195,7 @@ update_pal_halt_status(int status) void default_idle (void) { + local_irq_enable(); while (!need_resched()) if (can_do_pal_halt) safe_halt(); diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index d14692e0920a..bb9033187d42 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -40,6 +40,8 @@ #include <linux/serial_core.h> #include <linux/efi.h> #include <linux/initrd.h> +#include <linux/platform.h> +#include <linux/pm.h> #include <asm/ia32.h> #include <asm/machvec.h> @@ -779,6 +781,7 @@ cpu_init (void) /* size of physical stacked register partition plus 8 bytes: */ __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8; platform_cpu_init(); + pm_idle = default_idle; } void |