diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-06-06 16:15:28 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-06-10 01:31:47 +0900 |
| commit | f8224f7f4801733a46f332d9eb498234ff1ddac2 (patch) | |
| tree | a3d42e6c7458fa1057af02b36d47b5cf0f4bbc09 | |
| parent | d21832e212d2613c0a0f3e5f09967cb3402c8a53 (diff) | |
| download | linux-stable-f8224f7f4801733a46f332d9eb498234ff1ddac2.tar.gz linux-stable-f8224f7f4801733a46f332d9eb498234ff1ddac2.tar.bz2 linux-stable-f8224f7f4801733a46f332d9eb498234ff1ddac2.zip | |
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>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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__ |