The patch titled
acpi-include-apic-h fix
has been added to the -mm tree. Its filename is
acpi-include-apic-h-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: acpi-include-apic-h fix
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
asm/apic.h contains the ARCH_APICTIMER_STOPS_ON_C3 define for i386 and
x86_64. It gets magically included on SMP via linux/smp.h, but not on UP.
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/processor_idle.c | 9 +++++++++
1 files changed, 9 insertions(+)
diff -puN drivers/acpi/processor_idle.c~acpi-include-apic-h-fix drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c~acpi-include-apic-h-fix
+++ a/drivers/acpi/processor_idle.c
@@ -40,7 +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>
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
origin.patch
setup_irq-better-mismatch-debugging.patch
gtod-exponential-update_wall_time.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
time-uninline-jiffiesh.patch
time-uninline-jiffiesh-fix.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a-function.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-remove-incorrect-warning-in-kernel-timerc.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
high-res-timers-core.patch
gtod-mark-tsc-unusable-for-highres-timers.patch
dynticks-core.patch
dynticks-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
highres-timer-core-fix-status-check.patch
highres-timer-core-fix-commandline-setup.patch
clockevents-smp-on-up-features.patch
highres-depend-on-clockevents.patch
i386-apic-cleanup.patch
pm-timer-allow-early-access.patch
i386-lapic-timer-calibration.patch
clockevents-add-broadcast-support.patch
clockevents-add-broadcast-support-fix.patch
acpi-include-apic-h.patch
acpi-include-apic-h-fix.patch
acpi-keep-track-of-timer-broadcast.patch
i386-apic-timer-use-clockevents-broadcast.patch
acpi-verify-lapic-timer.patch
acpi-verify-lapic-timer-exports.patch
acpi-verify-lapic-timer-fix.patch
round_jiffies-infrastructure.patch
round_jiffies-infrastructure-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
