Messages in this thread Patch in this message | | | Date | Wed, 12 Apr 2017 15:18:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the char-misc tree |
| |
Hi all,
After merging the char-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/firmware/google/memconsole-x86-legacy.c:23:0: arch/x86/include/uapi/asm/e820.h:66:23: error: 'E820_X_MAX' undeclared here (not in a function) struct e820entry map[E820_X_MAX]; ^
Caused by commit
afe9dba4f9ae ("firmware: google memconsole: Move specific EBDA parts")
interacting with commit
66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h")
from the tip tree.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 12 Apr 2017 15:12:12 +1000 Subject: [PATCH] firmware: google memconsole: merge fix for e820.h move
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/firmware/google/memconsole-x86-legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/google/memconsole-x86-legacy.c index 529078c62488..99df2749c4c5 100644 --- a/drivers/firmware/google/memconsole-x86-legacy.c +++ b/drivers/firmware/google/memconsole-x86-legacy.c @@ -20,7 +20,7 @@ #include <linux/dmi.h> #include <linux/mm.h> #include <asm/bios_ebda.h> -#include <asm/e820.h> +#include <asm/e820/api.h> #include <linux/acpi.h> #include "memconsole.h" -- 2.11.0 -- Cheers, Stephen Rothwell
| |