diff options
author | Saurabh Sengar <ssengar@linux.microsoft.com> | 2023-08-25 10:47:36 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2023-10-02 22:30:09 +0300 |
commit | 0d294c8c4efa5c0f283a6dfc82dc014a5dbd9308 (patch) | |
tree | f37e5408ee0a3ad70c04f10c2bfd8759b68ba540 /arch/x86/include/asm/prom.h | |
parent | 24775700eaa93ff83b2a0f1e005879cdf186cdd9 (diff) | |
download | linux-0d294c8c4efa5c0f283a6dfc82dc014a5dbd9308.tar.xz |
x86/of: Move the x86_flattree_get_config() call out of x86_dtb_init()
Fetching the device tree configuration before initmem_init() is necessary
to allow the parsing of NUMA node information. However moving the entire
x86_dtb_init() call before initmem_init() is not correct as APIC/IO-APIC enumeration
has to be after initmem_init().
Thus, move the x86_flattree_get_config() call out of x86_dtb_init(),
into setup_arch(), to call it before initmem_init(), and
leave the ACPI/IOAPIC registration sequence as-is.
[ mingo: Updated the changelog for clarity. ]
Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lore.kernel.org/r/1692949657-16446-1-git-send-email-ssengar@linux.microsoft.com
Diffstat (limited to 'arch/x86/include/asm/prom.h')
-rw-r--r-- | arch/x86/include/asm/prom.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h index b716d291d0d4..65dee2420624 100644 --- a/arch/x86/include/asm/prom.h +++ b/arch/x86/include/asm/prom.h @@ -31,6 +31,11 @@ static inline void x86_dtb_init(void) { } #define of_ioapic 0 #endif +#ifdef CONFIG_OF_EARLY_FLATTREE +void x86_flattree_get_config(void); +#else +static inline void x86_flattree_get_config(void) { } +#endif extern char cmd_line[COMMAND_LINE_SIZE]; #endif /* __ASSEMBLY__ */ |