[Xen-changelog] [xen-unstable] CONFIG_X86_64 -> CONFIG_X86

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1347478372 -3600
# Node ID dab6583e187381811b84d2b93c63c9197a0a8e31
# Parent  baf1da1e0be53c018dcec16292c9f33258b71e35
CONFIG_X86_64 -> CONFIG_X86

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r baf1da1e0be5 -r dab6583e1873 xen/common/memory.c
--- a/xen/common/memory.c       Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/common/memory.c       Wed Sep 12 20:32:52 2012 +0100
@@ -188,7 +188,7 @@ int guest_remove_page(struct domain *d, 
         return 0;
     }
             
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86
     if ( p2m_is_shared(p2mt) )
     {
         /* Unshare the page, bail out on error. We unshare because 
@@ -205,7 +205,7 @@ int guest_remove_page(struct domain *d, 
         mfn = mfn_x(get_gfn_query_unlocked(d, gmfn, &p2mt));
         ASSERT(!p2m_is_shared(p2mt));
     }
-#endif /* CONFIG_X86_64 */
+#endif /* CONFIG_X86 */
 
     page = mfn_to_page(mfn);
     if ( unlikely(!get_page(page, d)) )
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/passthrough/ats.h
--- a/xen/drivers/passthrough/ats.h     Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/passthrough/ats.h     Wed Sep 12 20:32:52 2012 +0100
@@ -26,7 +26,7 @@ struct pci_ats_dev {
     u16 ats_queue_depth;    /* ATS device invalidation queue depth */
 };
 
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86
 
 #define ATS_REG_CAP    4
 #define ATS_REG_CTL    6
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/passthrough/vtd/extern.h
--- a/xen/drivers/passthrough/vtd/extern.h      Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/passthrough/vtd/extern.h      Wed Sep 12 20:32:52 2012 +0100
@@ -56,7 +56,7 @@ struct acpi_drhd_unit * ioapic_to_drhd(u
 struct acpi_drhd_unit * iommu_to_drhd(struct iommu *iommu);
 struct acpi_rhsa_unit * drhd_to_rhsa(struct acpi_drhd_unit *drhd);
 
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86
 struct acpi_drhd_unit * find_ats_dev_drhd(struct iommu *iommu);
 
 int ats_device(const struct pci_dev *, const struct acpi_drhd_unit *);
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/passthrough/vtd/quirks.c
--- a/xen/drivers/passthrough/vtd/quirks.c      Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/passthrough/vtd/quirks.c      Wed Sep 12 20:32:52 2012 +0100
@@ -363,7 +363,7 @@ void me_wifi_quirk(struct domain *domain
  */
 void __init pci_vtd_quirk(struct pci_dev *pdev)
 {
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86
     int seg = pdev->seg;
     int bus = pdev->bus;
     int dev = PCI_SLOT(pdev->devfn);
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/passthrough/vtd/x86/Makefile
--- a/xen/drivers/passthrough/vtd/x86/Makefile  Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/passthrough/vtd/x86/Makefile  Wed Sep 12 20:32:52 2012 +0100
@@ -1,2 +1,2 @@
 obj-y += vtd.o
-obj-$(CONFIG_X86_64) += ats.o
+obj-y += ats.o
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/passthrough/x86/Makefile
--- a/xen/drivers/passthrough/x86/Makefile      Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/passthrough/x86/Makefile      Wed Sep 12 20:32:52 2012 +0100
@@ -1,1 +1,1 @@
-obj-$(CONFIG_X86_64) += ats.o
+obj-y += ats.o
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/video/Makefile
--- a/xen/drivers/video/Makefile        Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/video/Makefile        Wed Sep 12 20:32:52 2012 +0100
@@ -1,5 +1,5 @@
-obj-y                := vga.o
-obj-$(CONFIG_X86_64) += font_8x14.o
-obj-$(CONFIG_X86_64) += font_8x16.o
-obj-$(CONFIG_X86_64) += font_8x8.o
-obj-$(CONFIG_X86_64) += vesa.o
+obj-y := vga.o
+obj-$(CONFIG_X86) += font_8x14.o
+obj-$(CONFIG_X86) += font_8x16.o
+obj-$(CONFIG_X86) += font_8x8.o
+obj-$(CONFIG_X86) += vesa.o
diff -r baf1da1e0be5 -r dab6583e1873 xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c   Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/drivers/video/vga.c   Wed Sep 12 20:32:52 2012 +0100
@@ -54,7 +54,7 @@ string_param("vga", opt_vga);
 static unsigned int columns, lines;
 #define ATTRIBUTE   7
 
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86
 void vesa_early_init(void);
 void vesa_endboot(bool_t keep);
 #else
diff -r baf1da1e0be5 -r dab6583e1873 xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h      Wed Sep 12 20:23:10 2012 +0100
+++ b/xen/include/asm-x86/config.h      Wed Sep 12 20:32:52 2012 +0100
@@ -107,7 +107,6 @@ extern unsigned char boot_edid_info[128]
 
 #define asmlinkage
 
-#define CONFIG_X86_64 1
 #define CONFIG_COMPAT 1
 
 #define PML4_ENTRY_BITS  39

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