4 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 8f57fc72d62c..d152dfbc360d 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -225,7 +225,7 @@ endif
 #
 # Board-dependent options and extra files
 #
-include $(srctree)/arch/mips/Kbuild.platforms
+include arch/mips/Kbuild.platforms
 ifdef CONFIG_PHYSICAL_START
 load-y                                  = $(CONFIG_PHYSICAL_START)
diff --git a/arch/um/Makefile b/arch/um/Makefile
index e4b1a9639c4d..17d4460b1af3 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -43,8 +43,8 @@ endif
 HOST_DIR := arch/$(HEADER_ARCH)
-include $(srctree)/$(ARCH_DIR)/Makefile-skas
+include $(ARCH_DIR)/Makefile-skas
-include $(srctree)/$(HOST_DIR)/Makefile.um
+include $(HOST_DIR)/Makefile.um
 core-y += $(HOST_DIR)/um/
@@ -73,7 +73,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
        $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
 #This will adjust *FLAGS accordingly to the platform.
-include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
+include $(ARCH_DIR)/Makefile-os-$(OS)
 KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
                   -I$(srctree)/$(HOST_DIR)/include/uapi \
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 5ba2d9ce82dc..2fda005bb334 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -63,7 +63,7 @@ ifeq ($(CONFIG_X86_32),y)
                                $(call cc-option,-fno-unit-at-a-time))
        # CPU-specific tuning. Anything which can be shared with UML should go here.
-        include $(srctree)/arch/x86/Makefile_32.cpu
+        include arch/x86/Makefile_32.cpu
        KBUILD_CFLAGS += $(cflags-y)
        # temporary until string.h is fixed
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 95eba554baf9..5b7e898ffd9a 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -18,7 +18,7 @@ LDS_EXTRA		:= -Ui386
 export LDS_EXTRA
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
-include $(srctree)/arch/x86/Makefile_32.cpu
+include arch/x86/Makefile_32.cpu
 # prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
 cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 8f57fc72d62c..d152dfbc360d 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile
@@ -225,7 +225,7 @@ endif
225	#	225	#
226	# Board-dependent options and extra files	226	# Board-dependent options and extra files
227	#	227	#
228	include $(srctree)/arch/mips/Kbuild.platforms	228	include arch/mips/Kbuild.platforms
229		229
230	ifdef CONFIG_PHYSICAL_START	230	ifdef CONFIG_PHYSICAL_START
231	load-y = $(CONFIG_PHYSICAL_START)	231	load-y = $(CONFIG_PHYSICAL_START)


diff --git a/arch/um/Makefile b/arch/um/Makefile index e4b1a9639c4d..17d4460b1af3 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile
@@ -43,8 +43,8 @@ endif
43		43
44	HOST_DIR := arch/$(HEADER_ARCH)	44	HOST_DIR := arch/$(HEADER_ARCH)
45		45
46	include $(srctree)/$(ARCH_DIR)/Makefile-skas	46	include $(ARCH_DIR)/Makefile-skas
47	include $(srctree)/$(HOST_DIR)/Makefile.um	47	include $(HOST_DIR)/Makefile.um
48		48
49	core-y += $(HOST_DIR)/um/	49	core-y += $(HOST_DIR)/um/
50		50
@@ -73,7 +73,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
73	$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include	73	$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
74		74
75	#This will adjust *FLAGS accordingly to the platform.	75	#This will adjust *FLAGS accordingly to the platform.
76	include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)	76	include $(ARCH_DIR)/Makefile-os-$(OS)
77		77
78	KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \	78	KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
79	-I$(srctree)/$(HOST_DIR)/include/uapi \	79	-I$(srctree)/$(HOST_DIR)/include/uapi \


diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 5ba2d9ce82dc..2fda005bb334 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile
@@ -63,7 +63,7 @@ ifeq ($(CONFIG_X86_32),y)
63	$(call cc-option,-fno-unit-at-a-time))	63	$(call cc-option,-fno-unit-at-a-time))
64		64
65	# CPU-specific tuning. Anything which can be shared with UML should go here.	65	# CPU-specific tuning. Anything which can be shared with UML should go here.
66	include $(srctree)/arch/x86/Makefile_32.cpu	66	include arch/x86/Makefile_32.cpu
67	KBUILD_CFLAGS += $(cflags-y)	67	KBUILD_CFLAGS += $(cflags-y)
68		68
69	# temporary until string.h is fixed	69	# temporary until string.h is fixed


diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um index 95eba554baf9..5b7e898ffd9a 100644 --- a/arch/x86/Makefile.um +++ b/arch/x86/Makefile.um
@@ -18,7 +18,7 @@ LDS_EXTRA := -Ui386
18	export LDS_EXTRA	18	export LDS_EXTRA
19		19
20	# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.	20	# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
21	include $(srctree)/arch/x86/Makefile_32.cpu	21	include arch/x86/Makefile_32.cpu
22		22
23	# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.	23	# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
24	cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)	24	cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)