aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>2005-04-18 23:06:47 -0400
committerLen Brown <len.brown@intel.com>2005-07-12 00:10:20 -0400
commit6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b (patch)
tree1d2cd6e75a4330039ddac768a1d71518f9476c67
parentef7b06cd905424aea7c31f27fef622e84e75e650 (diff)
[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>
-rw-r--r--arch/ia64/kernel/process.c1
-rw-r--r--arch/ia64/kernel/setup.c3
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)
195void 195void
196default_idle (void) 196default_idle (void)
197{ 197{
198 local_irq_enable();
198 while (!need_resched()) 199 while (!need_resched())
199 if (can_do_pal_halt) 200 if (can_do_pal_halt)
200 safe_halt(); 201 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 @@
40#include <linux/serial_core.h> 40#include <linux/serial_core.h>
41#include <linux/efi.h> 41#include <linux/efi.h>
42#include <linux/initrd.h> 42#include <linux/initrd.h>
43#include <linux/platform.h>
44#include <linux/pm.h>
43 45
44#include <asm/ia32.h> 46#include <asm/ia32.h>
45#include <asm/machvec.h> 47#include <asm/machvec.h>
@@ -779,6 +781,7 @@ cpu_init (void)
779 /* size of physical stacked register partition plus 8 bytes: */ 781 /* size of physical stacked register partition plus 8 bytes: */
780 __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8; 782 __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8;
781 platform_cpu_init(); 783 platform_cpu_init();
784 pm_idle = default_idle;
782} 785}
783 786
784void 787void