WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Fix the x86/64 build. Patch based on one from Andrei Pet

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Fix the x86/64 build. Patch based on one from Andrei Petrov.
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Thu, 12 May 2005 10:31:31 +0000
Delivery-date: Thu, 12 May 2005 11:02:59 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
ChangeSet 1.1452, 2005/05/12 11:31:31+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix the x86/64 build. Patch based on one from Andrei Petrov.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 boot.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)


diff -Nru a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c  2005-05-12 07:03:32 -04:00
+++ b/xen/arch/x86/acpi/boot.c  2005-05-12 07:03:32 -04:00
@@ -36,25 +36,12 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mpspec.h>
+#include <mach_apic.h>
+#include <mach_mpparse.h>
 
 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 ||  \

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Fix the x86/64 build. Patch based on one from Andrei Petrov., BitKeeper Bot <=