ia64/xen-unstable

changeset 6473:15d378281a0b

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>
author kaf24@firebug.cl.cam.ac.uk
date Sat Aug 27 11:49:35 2005 +0000 (2005-08-27)
parents f3e63b95c07a
children fb2fae2cc003
files linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Sat Aug 27 09:15:17 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Sat Aug 27 11:49:35 2005 +0000
     1.3 @@ -610,7 +610,7 @@ static int __init acpi_parse_fadt(unsign
     1.4  	acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode;
     1.5  #endif
     1.6  
     1.7 -#ifdef CONFIG_X86_PM_TIMER
     1.8 +#if defined(CONFIG_X86_PM_TIMER) && !defined(CONFIG_XEN)
     1.9  	/* detect the location of the ACPI PM Timer */
    1.10  	if (fadt->revision >= FADT2_REVISION_ID) {
    1.11  		/* FADT rev. 2 */
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile	Sat Aug 27 09:15:17 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/Makefile	Sat Aug 27 11:49:35 2005 +0000
     2.3 @@ -40,7 +40,7 @@ obj-$(CONFIG_DUMMY_IOMMU)	+= pci-nommu.o
     2.4  i386-obj-$(CONFIG_DUMMY_IOMMU)	+= pci-dma.o
     2.5  i386-obj-$(CONFIG_SWIOTLB)	+= swiotlb.o
     2.6  obj-$(CONFIG_KPROBES)		+= kprobes.o
     2.7 -obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
     2.8 +#obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
     2.9  
    2.10  c-obj-$(CONFIG_MODULES)		+= module.o
    2.11