From: Doug Goldstein Date: Tue, 15 Dec 2015 13:14:00 +0000 (+0100) Subject: build: convert HAS_PDX use to Kconfig X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2060 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=04075af1371990449da2cdc0519fd123c2cb7bfc;p=xen.git build: convert HAS_PDX use to Kconfig Use the Kconfig generated CONFIG_HAS_PDX defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- diff --git a/xen/Rules.mk b/xen/Rules.mk index f572c0dc7c..d55c58c291 100644 --- 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 c88a5d8855..1ac2233125 100644 --- 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 90b1f246fe..52b1ad481d 100644 --- 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 12780f96cb..d472234f81 100644 --- 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 88c47ab6ae..568fa97b85 100644 --- 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 75edd45f85..4905574683 100644 --- 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 5dc2bb288c..0acd2b0f73 100644 --- 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 18fe8e5f38..c7c837ec32 100644 --- 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;