x86: devicetree: fix config option around x86_flattree_get_config()

frowand · frowand · commit 581e929018ce · 2018-03-04T00:28:55.000-08:00
x86_flattree_get_config() is incorrectly protected by
ifdef CONFIG_OF_FLATTREE.  It uses of_get_flat_dt_size(), which
only exists if CONFIG_OF_EARLY_FLATTREE.  This issue has not
been exposed previously because OF_FLATTREE did not occur unless
it was selected by OF_EARLY_FLATTREE.  A devicetree overlay change
is selecting OF_FLATTREE directly instead of indirectly enabling
it by selecting OF_EARLY_FLATTREE.

This problem was exposed by a randconfig generated by the kbuild
test robot, where Platform OLPC was enabled.  OLPC selects
OF_PROMTREE instead of OF_EARLY_FLATREE.  The only other x86
platform that selects OF is X86_INTEL_CE, which does select
OF_EARLY_FLATTREE.

Signed-off-by: Frank Rowand &lt;frank.rowand@sony.com&gt;
Acked-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
@@ -259,7 +259,7 @@ static void __init dtb_apic_setup(void)
 	dtb_ioapic_setup();
 }
 
-#ifdef CONFIG_OF_FLATTREE
+#ifdef CONFIG_OF_EARLY_FLATTREE
 static void __init x86_flattree_get_config(void)
 {
 	u32 size, map_len;

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ static void __init dtb_apic_setup(void)`
`259`	`259`	`dtb_ioapic_setup();`
`260`	`260`	`}`
`261`	`261`
`262`		`-#ifdef CONFIG_OF_FLATTREE`
	`262`	`+#ifdef CONFIG_OF_EARLY_FLATTREE`
`263`	`263`	`static void __init x86_flattree_get_config(void)`
`264`	`264`	`{`
`265`	`265`	`u32 size, map_len;`