diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-10-17 21:14:18 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2009-12-12 13:08:13 +0100 |
| commit | 24a675e8b86bef077e549a5ea2c6936989be4815 (patch) | |
| tree | 865bea4b359252c1289c91025ae26a82d85f26a7 | |
| parent | 4a2ff67c88211026afcbdbc190c13f705dae1b59 (diff) | |
| download | linux-stable-24a675e8b86bef077e549a5ea2c6936989be4815.tar.gz linux-stable-24a675e8b86bef077e549a5ea2c6936989be4815.tar.bz2 linux-stable-24a675e8b86bef077e549a5ea2c6936989be4815.zip | |
kbuild: search arch/$ARCH/include before include/
The namespace used in arch/$ARCH/include is different from
what is used in include/ except for the include/asm directory.
This patch gives the arch/$ARCH/include/asm directory priority
over include/asm.
When we add asm-offsets.h to arch/$ARCH/include/asm/ this
patch makes sure we pick up the arch specific version
and not the one we have in include/asm.
The situation with an asm-offsets.h file located in
both include/asm _and_ arch/$ARCH/include/asm will happen
when we move more files over to include/generated.
This happens because in some cases it is not practical
to rename all users so we simply add a file
in arch/$ARCH/include/asm that includes the generated version.
This is the solution we use for asm-offsets.h as an example.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -334,9 +334,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option -LINUXINCLUDE := -Iinclude \ +LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ - -I$(srctree)/arch/$(hdr-arch)/include \ -include include/linux/autoconf.h KBUILD_CPPFLAGS := -D__KERNEL__ |