ia64/xen-unstable

changeset 4865:b6186f6b202e

bitkeeper revision 1.1389.19.4 (42833083E4kFA8A5tBgDNgF_X2CkBA)

Fix the x86/64 build. Patch based on one from Andrei Petrov.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu May 12 10:31:31 2005 +0000 (2005-05-12)
parents ab9da433c598
children f80fbc4d6526
files xen/arch/x86/acpi/boot.c
line diff
     1.1 --- a/xen/arch/x86/acpi/boot.c	Thu May 12 10:29:11 2005 +0000
     1.2 +++ b/xen/arch/x86/acpi/boot.c	Thu May 12 10:31:31 2005 +0000
     1.3 @@ -36,26 +36,13 @@
     1.4  #include <asm/io.h>
     1.5  #include <asm/irq.h>
     1.6  #include <asm/mpspec.h>
     1.7 +#include <mach_apic.h>
     1.8 +#include <mach_mpparse.h>
     1.9  
    1.10  int sbf_port;
    1.11  #define end_pfn_map max_page
    1.12  #define CONFIG_ACPI_PCI
    1.13  
    1.14 -#ifdef	CONFIG_X86_64
    1.15 -
    1.16 -static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
    1.17 -extern void __init clustered_apic_check(void);
    1.18 -static inline int ioapic_setup_disabled(void) { return 0; }
    1.19 -
    1.20 -#else	/* X86 */
    1.21 -
    1.22 -#ifdef	CONFIG_X86_LOCAL_APIC
    1.23 -#include <mach_apic.h>
    1.24 -#include <mach_mpparse.h>
    1.25 -#endif	/* CONFIG_X86_LOCAL_APIC */
    1.26 -
    1.27 -#endif	/* X86 */
    1.28 -
    1.29  #define BAD_MADT_ENTRY(entry, end) (					    \
    1.30  		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
    1.31  		((acpi_table_entry_header *)entry)->length != sizeof(*entry))