From 6bcc5dc0a1e047827b7717d00c06c6ab6f297e8d Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 16 Feb 2007 01:27:54 -0800
Subject: [PATCH] --- yaml --- r: 48584 b: refs/heads/master c:
 3434933b17fa64adddf83059603c61296f6e1ee2 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/acpi/processor_idle.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9006decc08c6..da10c402713a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd3629b5e5f03dde6d8a17bb798bcb0ba6c3f579
+refs/heads/master: 3434933b17fa64adddf83059603c61296f6e1ee2
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 6c6751b1405b..e34af7772a66 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -40,6 +40,16 @@
 #include <linux/sched.h>	/* need_resched() */
 #include <linux/latency.h>
 
+/*
+ * Include the apic definitions for x86 to have the APIC timer related defines
+ * available also for UP (on SMP it gets magically included via linux/smp.h).
+ * asm/acpi.h is not an option, as it would require more include magic. Also
+ * creating an empty asm-ia64/apic.h would just trade pest vs. cholera.
+ */
+#ifdef CONFIG_X86
+#include <asm/apic.h>
+#endif
+
 #include <asm/io.h>
 #include <asm/uaccess.h>