Messages in this thread Patch in this message | | | Date | Thu, 22 Mar 2012 14:26:24 -0700 | From | "tip-bot for H. Peter Anvin" <> | Subject | [tip:x86/urgent] x86, boot: Correct CFLAGS for hostprogs |
| |
Commit-ID: 446e1c86d51d0823e003a43a2b85c430efce2733 Gitweb: http://git.kernel.org/tip/446e1c86d51d0823e003a43a2b85c430efce2733 Author: H. Peter Anvin <hpa@zytor.com> AuthorDate: Thu, 22 Mar 2012 11:08:18 -0700 Committer: H. Peter Anvin <hpa@zytor.com> CommitDate: Thu, 22 Mar 2012 12:42:51 -0700
x86, boot: Correct CFLAGS for hostprogs
This is a partial revert of commit: d40f833 "Restrict CFLAGS for hostprogs"
The endian-manipulation macros in tools/include need <linux/types.h>, but the hostprogs in arch/x86/boot need several headers from the kernel build tree, which means we have to add the kernel headers to the include path. This picks up <linux/types.h> from the kernel tree, which gives a warning.
Since this use of <linux/types.h> is intentional, add -D__EXPORTED_HEADERS__ to the command line to silence the warning.
A better way to fix this would be to always install the exported kernel headers into $(objtree)/usr/include as a standard part of the kernel build, but that is a lot more involved.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Matt Fleming <matt.fleming@intel.com> Link: http://lkml.kernel.org/r/1330436245-24875-5-git-send-email-matt@console-pimps.org Signed-off-by: H. Peter Anvin <hpa@zytor.com> --- arch/x86/boot/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 3e02148..5a747dd 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,9 +37,9 @@ setup-y += video-bios.o targets += $(setup-y) hostprogs-y := mkcpustr tools/build -HOSTCFLAGS_mkcpustr.o := -I$(srctree)/arch/$(SRCARCH)/include -HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/tools/include \ - -include $(srctree)/include/linux/kconfig.h +HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(LINUXINCLUDE) \ + -D__EXPORTED_HEADERS__ + $(obj)/cpu.o: $(obj)/cpustr.h quiet_cmd_cpustr = CPUSTR $@
| |