From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrei Petrov <andrei.petrov@veritas.com>
Subject: x86_64 build patch
Date: Wed, 11 May 2005 14:54:05 -0700
Message-ID: <20050511215405.GA7195@ezzy.veritas.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

This patch makes recent unstable buildable on x86_64.

--- xen/arch/x86/acpi/boot.c.orig       2005-05-11 09:54:27.000000000 -0700
+++ xen/arch/x86/acpi/boot.c    2005-05-11 14:48:37.000000000 -0700
@@ -41,21 +41,11 @@ int sbf_port;
 #define end_pfn_map max_page
 #define CONFIG_ACPI_PCI
 
-#ifdef CONFIG_X86_64
-
-static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
-extern void __init clustered_apic_check(void);
-static inline int ioapic_setup_disabled(void) { return 0; }
-
-#else  /* X86 */
-
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <mach_apic.h>
 #include <mach_mpparse.h>
 #endif /* CONFIG_X86_LOCAL_APIC */
 
-#endif /* X86 */
-
 #define BAD_MADT_ENTRY(entry, end) (                                       \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
                ((acpi_table_entry_header *)entry)->length != sizeof(*entry))