# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/04/18 23:06:47-04:00 len.brown@intel.com 
#   [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>
# 
# arch/ia64/kernel/setup.c
#   2005/04/11 17:55:39-04:00 len.brown@intel.com +3 -0
#   C1 patch for IA64
# 
# arch/ia64/kernel/process.c
#   2005/04/11 17:45:15-04:00 len.brown@intel.com +1 -0
#   C1 patch for IA64
# 
Index: linux-2.6.12/arch/ia64/kernel/process.c
===================================================================
--- linux-2.6.12.orig/arch/ia64/kernel/process.c	2005-07-09 23:35:05.000000000 -0400
+++ linux-2.6.12/arch/ia64/kernel/process.c	2005-07-10 00:28:21.000000000 -0400
@@ -195,6 +195,7 @@
 void
 default_idle (void)
 {
+	local_irq_enable();
 	while (!need_resched())
 		if (can_do_pal_halt)
 			safe_halt();
Index: linux-2.6.12/arch/ia64/kernel/setup.c
===================================================================
--- linux-2.6.12.orig/arch/ia64/kernel/setup.c	2005-07-09 23:35:02.000000000 -0400
+++ linux-2.6.12/arch/ia64/kernel/setup.c	2005-07-10 00:27:41.000000000 -0400
@@ -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 @@
 	/* 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