linux/x86: Modify CPPFLAGS just in a single place.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index adf942efe7a096e98dfc8600cab52bdc4dc1a35a..f25b22a2bd74785d5d369e90c6190a9cc9ef3747 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -48,11 +48,6 @@ CFLAGS                               += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-op
 
 CFLAGS += $(cflags-y)
 
-cppflags-$(CONFIG_XEN) += \
-       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-
-CPPFLAGS += $(cppflags-y)
-
 # Default subarch .c files
 mcore-y  := mach-default
 
@@ -115,7 +110,8 @@ PHONY += zImage bzImage vmlinuz compressed zlilo bzlilo \
          zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
 
 ifdef CONFIG_XEN
-CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
+CPPFLAGS := -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION) \
+       -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 all: vmlinuz
 
 # KBUILD_IMAGE specifies the target image being built

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index a815081cdbc68dd8ebdd723e620ce93ee253eee4..a557ea992422221a625ac9ecad51c7de2494d1ba 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -32,10 +32,6 @@ cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
 cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
 cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
 
-cppflags-$(CONFIG_XEN) += \
-       -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-CPPFLAGS += $(cppflags-y)
-
 cflags-y += -m64
 cflags-y += -mno-red-zone
 cflags-y += -mcmodel=kernel
@@ -79,7 +75,8 @@ PHONY += bzImage bzlilo vmlinuz install archmrproper \
         fdimage fdimage144 fdimage288 isoimage archclean
 
 ifdef CONFIG_XEN
-CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
+CPPFLAGS := -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION) \
+       -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
 LDFLAGS_vmlinux := -e startup_64
 #Default target when executing "make"
 all: vmlinuz