path: root/Makefile
diff options
authorMichal Marek <mmarek@suse.cz>2015-01-08 16:16:39 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-08 14:24:54 -0800
commit90ac086bca100c654e84637d9990567f436cab23 (patch)
treeeb462b6ef1ac61649c380cefd372a0219d348d6e /Makefile
parentMerge tag 'pinctrl-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff)
Makefile: include arch/*/include/generated/uapi before .../generated
The introduction of the uapi directories in v3.7-rc1 moved some of the generated headers from arch/*/include/generated to the uapi directory, keeping the #include directives intact. This creates a problem when bisecting, because the unversioned files are not cleaned automatically by git and the compiler might include stale headers as a result. Instead of cleaning them in the Makefiles, promote arch/*/include/generated/uapi in the search path. Under normal circumstances, there is no overlap between this uapi subdirectory and its parent, so the include choices remain the same. We keep arch/*/include/generated/uapi in the USERINCLUDE variable so that it is usable standalone. Note that we cannot completely swap the order of the uapi and kernel-only directories, since the headers in include/uapi/asm-generic are meant to be wrapped by their include/asm-generic counterparts when building kernel code. Reported-by: "Nicholas A. Bellinger" <nab@linux-iscsi.org> Reported-by: David Drysdale <dmd@lurklurk.org> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index eb4eca56843a..87f0c052b0ac 100644
--- a/Makefile
+++ b/Makefile
@@ -391,6 +391,7 @@ USERINCLUDE := \
# Needed to be compatible with the O= option
-I$(srctree)/arch/$(hdr-arch)/include \
+ -Iarch/$(hdr-arch)/include/generated/uapi \
-Iarch/$(hdr-arch)/include/generated \
$(if $(KBUILD_SRC), -I$(srctree)/include) \
-Iinclude \