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@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
index 230673abb6c76a4cb36ac0dc984615718411bd54..bce4ef7ed46b2959b6c67b29bc4655a88eb1df2a 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
@@ -610,7 +610,7 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
        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 --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile
index 51be8f355f77db3e6bf1ee981d3c9bbbd02201bf..d08ec82b8328e17d2cd764514bc2989246ec88df 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_DUMMY_IOMMU)     += pci-nommu.o
 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