[PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
From: Matt Fleming The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 ("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 Cc: Ingo Molnar Acked-by: David Howells Signed-off-by: Matt Fleming --- Linus, I expected this fix to go through -tip but Ingo explained that the offending commit (abbf1590) doesn't exist in -tip yet, which is why I'm sending this directly to you. arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
From: Matt Fleming matt.flem...@intel.com The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 (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 h...@zytor.com Cc: Ingo Molnar mi...@kernel.org Acked-by: David Howells dhowe...@redhat.com Signed-off-by: Matt Fleming matt.flem...@intel.com --- Linus, I expected this fix to go through -tip but Ingo explained that the offending commit (abbf1590) doesn't exist in -tip yet, which is why I'm sending this directly to you. arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
On Wed, 2012-10-10 at 16:51 +0100, Matt Fleming wrote: > From: Matt Fleming > > The hostprogs need access to the CONFIG_* symbols found in > include/generated/autoconf.h. commit abbf1590 ("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 undersiable affect of breaking the EFI boot stub because > the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c was > 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 > Cc: Ingo Molnar > Acked-by: David Howells > Signed-off-by: Matt Fleming And here's a version without all the typos! --- >From 0fe8a9317d99ad8dd39807c0ad93d65e34aadfe9 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 10 Oct 2012 16:36:45 +0100 Subject: [PATCH] x86, boot: Explicitly include autoconf.h for hostprogs The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 ("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 was 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 Cc: Ingo Molnar Acked-by: David Howells Signed-off-by: Matt Fleming --- arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
From: Matt Fleming The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 ("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 undersiable affect of breaking the EFI boot stub because the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c was 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 Cc: Ingo Molnar Acked-by: David Howells Signed-off-by: Matt Fleming --- arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
From: Matt Fleming matt.flem...@intel.com The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 (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 undersiable affect of breaking the EFI boot stub because the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c was 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 h...@zytor.com Cc: Ingo Molnar mi...@kernel.org Acked-by: David Howells dhowe...@redhat.com Signed-off-by: Matt Fleming matt.flem...@intel.com --- arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86, boot: Explicitly include autoconf.h for hostprogs
On Wed, 2012-10-10 at 16:51 +0100, Matt Fleming wrote: From: Matt Fleming matt.flem...@intel.com The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 (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 undersiable affect of breaking the EFI boot stub because the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c was 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 h...@zytor.com Cc: Ingo Molnar mi...@kernel.org Acked-by: David Howells dhowe...@redhat.com Signed-off-by: Matt Fleming matt.flem...@intel.com And here's a version without all the typos! --- From 0fe8a9317d99ad8dd39807c0ad93d65e34aadfe9 Mon Sep 17 00:00:00 2001 From: Matt Fleming matt.flem...@intel.com Date: Wed, 10 Oct 2012 16:36:45 +0100 Subject: [PATCH] x86, boot: Explicitly include autoconf.h for hostprogs The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. commit abbf1590 (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 was 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 h...@zytor.com Cc: Ingo Molnar mi...@kernel.org Acked-by: David Howells dhowe...@redhat.com Signed-off-by: Matt Fleming matt.flem...@intel.com --- arch/x86/boot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ce03476..ccce0ed 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -37,7 +37,8 @@ setup-y += video-bios.o targets+= $(setup-y) hostprogs-y:= mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ + -include include/generated/autoconf.h \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h -- 1.7.11.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/