diff options
| author |   Frank Rowand <frank.rowand@sony.com> | 2018-03-02 20:00:31 -0800 |
|---|---|---|
| committer |   Frank Rowand <frowand.list@gmail.com> | 2018-03-04 00:28:55 -0800 |
| commit | 581e929018ce078d0ce0b02780de2f61e858903b (patch) | |
| tree | 87363ef0060f5deb41b2bef829e0e268f6505339 | |
| parent | Linux 4.16-rc1 (diff) | |
| download | linux-dev-581e929018ce078d0ce0b02780de2f61e858903b.tar.xz linux-dev-581e929018ce078d0ce0b02780de2f61e858903b.zip | |
x86: devicetree: fix config option around x86_flattree_get_config()
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@sony.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kernel/devicetree.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |