]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
UAPI: Partition the header include path sets and add uapi/ header directories
authorDavid Howells <dhowells@redhat.com>
Tue, 2 Oct 2012 17:01:26 +0000 (18:01 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 2 Oct 2012 17:01:26 +0000 (18:01 +0100)
commitabbf1590de22a6d2240a59383477da50d1402f6a
treee67f6a35d2c26328c878065e7796ccbcd8d90142
parenta1ce39288e6fbefdd8d607021d02384eb4a20b99
UAPI: Partition the header include path sets and add uapi/ header directories

Partition the header include path flags into two sets, one for kernelspace
builds and one for userspace builds.

Add the following directories to build after the ordinary include directories
so that #include will pick up the UAPI header directly if the kernel header
has been moved there.

The userspace set (represented by the USERINCLUDE make variable) contains:

-I $(srctree)/arch/$(hdr-arch)/include/uapi
-I arch/$(hdr-arch)/include/generated/uapi
-I $(srctree)/include/uapi
-I include/generated/uapi
-include $(srctree)/include/linux/kconfig.h

and the kernelspace set (represented by the LINUXINCLUDE make variable)
contains:

-I $(srctree)/arch/$(hdr-arch)/include
-I arch/$(hdr-arch)/include/generated
-I $(srctree)/include
-I include --- if not building in the source tree

plus everything in the USERINCLUDE set.

Then use USERINCLUDE in building the x86 boot code.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Makefile
arch/cris/Makefile
arch/um/Makefile
arch/x86/boot/Makefile
arch/x86/boot/mkcpustr.c
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/mkcapflags.pl