[Xen-changelog] CONFIG_X86_PM_TIMER is a no-op option when building Linux

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 15d378281a0b03c0c04b90890c2d07e83e4fecf9
# Parent  f3e63b95c07a813ae4c45d39ef91a7c3972b44a1
CONFIG_X86_PM_TIMER is a no-op option when building Linux
for Xen, but make sure it doesn't break the build.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r f3e63b95c07a -r 15d378281a0b 
linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c     Sat Aug 27 
09:15:17 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c     Sat Aug 27 
11:49:35 2005
@@ -610,7 +610,7 @@
        acpi_fadt.force_apic_physical_destination_mode = 
fadt->force_apic_physical_destination_mode;
 #endif
 
-#ifdef CONFIG_X86_PM_TIMER
+#if defined(CONFIG_X86_PM_TIMER) && !defined(CONFIG_XEN)
        /* detect the location of the ACPI PM Timer */
        if (fadt->revision >= FADT2_REVISION_ID) {
                /* FADT rev. 2 */
diff -r f3e63b95c07a -r 15d378281a0b 
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile      Sat Aug 27 
09:15:17 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile      Sat Aug 27 
11:49:35 2005
@@ -40,7 +40,7 @@
 i386-obj-$(CONFIG_DUMMY_IOMMU) += pci-dma.o
 i386-obj-$(CONFIG_SWIOTLB)     += swiotlb.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
-obj-$(CONFIG_X86_PM_TIMER)     += pmtimer.o
+#obj-$(CONFIG_X86_PM_TIMER)    += pmtimer.o
 
 c-obj-$(CONFIG_MODULES)                += module.o
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog