build: convert HAS_PDX use to Kconfig

Use the Kconfig generated CONFIG_HAS_PDX defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index f572c0dc7c84ef834b0ca07bcf9d4ee1f88109f1..d55c58c2910b77dd457e56efa6cad4e3f5354932 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -59,7 +59,6 @@ CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
 CFLAGS-$(HAS_MEM_ACCESS)  += -DHAS_MEM_ACCESS
 CFLAGS-$(HAS_MEM_PAGING)  += -DHAS_MEM_PAGING
 CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING
-CFLAGS-$(HAS_PDX)       += -DHAS_PDX
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
 
 ifneq ($(max_phys_cpus),)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index c88a5d8855f3e88e0921edf6b0e9e59166cd2e82..1ac2233125756a7f86434a7612aa46bc3ed65617 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -18,6 +18,7 @@ config ARM
        def_bool y
        select HAS_DEVICE_TREE
        select HAS_PASSTHROUGH
+       select HAS_PDX
        select HAS_VIDEO
 
 config ARCH_DEFCONFIG

diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index 90b1f246fe301defa70ed2923d58568e1f1fc2c7..52b1ad481d5940cf8e5b8f6ecd58aae4fafb622a 100644 (file)
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -7,7 +7,6 @@
 #
 
 HAS_ARM_HDLCD := y
-HAS_PDX := y
 
 CFLAGS += -I$(BASEDIR)/include
 

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 12780f96cbd27780b375bfc4e2525f366050d3d8..d472234f81b32677a281f5ae5a39e5f158204caa 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -10,6 +10,7 @@ config X86
        select HAS_NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI
+       select HAS_PDX
        select HAS_VGA
 
 config ARCH_DEFCONFIG

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 88c47ab6aef14f03ec93e2f306842dc017f3261f..568fa97b85f622e14f1b204d66c3b55647447b45 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -4,7 +4,6 @@
 HAS_NUMA := y
 HAS_EHCI := y
 HAS_KEXEC := y
-HAS_PDX := y
 HAS_CORE_PARKING := y
 xenoprof := y
 

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 75edd45f85abf1e34301cdd8ef86213fb97d4c46..490557468347cec47bc61ec8c27d4eb4dfbb4cee 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -5,6 +5,10 @@ menu "Common Features"
 config HAS_DEVICE_TREE
        bool
 
+# Select HAS_PDX if PDX is supported
+config HAS_PDX
+       bool
+
 # Select HAS_GDBSX if GDBSX is supported
 config HAS_GDBSX
        bool

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 5dc2bb288c24fe8a0772bb159a873bdb06742bf5..0acd2b0f73989bae94aa6a4863f4dea845febb2b 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -23,7 +23,7 @@ obj-y += memory.o
 obj-y += multicall.o
 obj-y += notifier.o
 obj-y += page_alloc.o
-obj-$(HAS_PDX) += pdx.o
+obj-$(CONFIG_HAS_PDX) += pdx.o
 obj-y += preempt.o
 obj-y += random.o
 obj-y += rangeset.o

diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h
index 18fe8e5f38a2cfb053d91e9305090be0de423577..c7c837ec32d838d127126427fbbc8fc49ced236d 100644 (file)
--- a/xen/include/xen/pdx.h
+++ b/xen/include/xen/pdx.h
@@ -1,7 +1,7 @@
 #ifndef __XEN_PDX_H__
 #define __XEN_PDX_H__
 
-#ifdef HAS_PDX
+#ifdef CONFIG_HAS_PDX
 
 extern unsigned long max_pdx;
 extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask;