kbuild: remove duplicated arch/*/include/generated/uapi include path

Commit 90ac086bca10 ("Makefile: include arch/*/include/generated/uapi
before .../generated") introduced this for bisect'ability.  The commit
chose to promote arch/*/include/generated/uapi in the search path
rather than cleaning stale headers.

After all, we found that approach was not enough, and ended up with
cleaning stale headers by commit cda2c65f981d ("kbuild: Remove stale
asm-generic wrappers").

So, the extra search path is no longer needed because Kbuild invokes
scripts/Makefile.asm-generic and remove stale headers before it starts
descending.

This commit is also reverting commit dc33db7c338e ("Kbuild: avoid
duplicate include path") because we have no more duplicated path.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/Makefile b/Makefile
index 57a013dc03648ea922f290fb44427065ffe5d911..0afd7f3c22b23a0671fd26f4129c3120cc7ca3d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -381,12 +381,10 @@ USERINCLUDE    := \
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := \
                -I$(srctree)/arch/$(hdr-arch)/include \
-               -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
                -I$(objtree)/arch/$(hdr-arch)/include/generated \
                $(if $(KBUILD_SRC), -I$(srctree)/include) \
-               -I$(objtree)/include
-
-LINUXINCLUDE   += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
+               -I$(objtree)/include \
+               $(USERINCLUDE)
 
 KBUILD_CPPFLAGS := -D__KERNEL__