On 03/03/18 16:17, frowand.list@xxxxxxxxx wrote: > From: Frank Rowand <frank.rowand@xxxxxxxx> > > 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 <frank.rowand@xxxxxxxx> > --- > > x86 Maintainers, please ack this patch for Rob to accept > > This patch previously submitted separately as: > > "x86: devicetree: fix config option around x86_flattree_get_config()" > https://lkml.org/lkml/2018/3/2/1148 > > so this is a jump from version 1 to version 6. ^^^^^^^^^ version 7 > > No changes from version 1. > > > arch/x86/kernel/devicetree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c > index 25de5f6ca997..45416826f6ee 100644 > --- 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; > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
