CONFIG_X86_64 -> CONFIG_X86

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 8779d6bd7de08c1c1242415f5dce2bcd8ec852b6..5bcb0350865a21039385a48ef6452c5c0296c5fb 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -188,7 +188,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn)
         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, unsigned long gmfn)
         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 --git a/xen/drivers/passthrough/ats.h b/xen/drivers/passthrough/ats.h
index 5cb09ead1a8e0b01561e5d596dc72efb99082ece..a6efa893b2e49ef9d40ede7d2d44ec7935bf004e 100644 (file)
--- a/xen/drivers/passthrough/ats.h
+++ b/xen/drivers/passthrough/ats.h
@@ -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 --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h
index bcfa8702d918e824d4dbe1380864a63384b6db87..0823218e1597bd91260892481e403eac8cc97597 100644 (file)
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -56,7 +56,7 @@ struct acpi_drhd_unit * ioapic_to_drhd(unsigned int apic_id);
 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 --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c
index 6b92164c45bdfbee7ba352358da4e68dd3e57839..da79dd78bc5fff159dada33e056d5454d64f23ee 100644 (file)
--- a/xen/drivers/passthrough/vtd/quirks.c
+++ b/xen/drivers/passthrough/vtd/quirks.c
@@ -363,7 +363,7 @@ void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map)
  */
 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 --git a/xen/drivers/passthrough/vtd/x86/Makefile b/xen/drivers/passthrough/vtd/x86/Makefile
index a24bd271c7519265288ae492fafec732431b54a4..df4509db409a0827158c60c080974ee258405b70 100644 (file)
--- a/xen/drivers/passthrough/vtd/x86/Makefile
+++ b/xen/drivers/passthrough/vtd/x86/Makefile
@@ -1,2 +1,2 @@
 obj-y += vtd.o
-obj-$(CONFIG_X86_64) += ats.o
+obj-y += ats.o

diff --git a/xen/drivers/passthrough/x86/Makefile b/xen/drivers/passthrough/x86/Makefile
index 644f4dd51c67bb80fd26cc35ed22777323e8818f..c124a5178a236cc22163bf589a7c09d0c571992d 100644 (file)
--- a/xen/drivers/passthrough/x86/Makefile
+++ b/xen/drivers/passthrough/x86/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_X86_64) += ats.o
+obj-y += ats.o

diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index b1f5bd7d0cf83bea3a6f7fe6c9e956f727cafcd1..6c3e5b4ba702ef7326cf779dd7f11a14da8f1c89 100644 (file)
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -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 --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index 9fabaf4ab43daf090786de9480d3f2728508276c..a98bd000340146de1a6eeee8a28caeb9423efe74 100644 (file)
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -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 --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index b695915001e8f2c1920d3dc44d674cc2997db901..b69dbe6a378069b5cd0f43a3c53ed49387287db1 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -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