tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86, boot: Explicitly include autoconf.h for hostprogs

The hostprogs need access to the CONFIG_* symbols found in
include/generated/autoconf.h. But commit abbf1590de22 ("UAPI: Partition
the header include path sets and add uapi/ header directories") replaced
$(LINUXINCLUDE) with $(USERINCLUDE) which doesn't contain the necessary
include paths.

This has the undesirable effect of breaking the EFI boot stub because
the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c is
never compiled.

It should also be noted that because $(USERINCLUDE) isn't exported by
the top-level Makefile it's actually empty in arch/x86/boot/Makefile.

Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Matt Fleming and committed by Linus Torvalds b6eea87f 7d380c8f

options
unified split
Changed files
+2 -1
arch
x86
boot
Makefile
+2 -1
arch/x86/boot/Makefile
··· 37 37 targets += $(setup-y) 38 38 hostprogs-y := mkcpustr tools/build 39 39 40 - HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ 40 + HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ 41 + -include include/generated/autoconf.h \ 41 42 -D__EXPORTED_HEADERS__ 42 43 43 44 $(obj)/cpu.o: $(obj)/cpustr.h