diff options
| author | Oreoluwa Babatunde <quic_obabatun@quicinc.com> | 2024-02-10 01:29:30 +0100 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2024-03-10 09:55:46 +0100 |
| commit | 7b432bf376c9c198a7ff48f1ed14a14c0ffbe1fe (patch) | |
| tree | fe139302761c5c1b320fda195e2ca00c0772dac1 /arch/openrisc/kernel | |
| parent | Linux 6.8-rc5 (diff) | |
| download | linux-7b432bf376c9c198a7ff48f1ed14a14c0ffbe1fe.tar.xz linux-7b432bf376c9c198a7ff48f1ed14a14c0ffbe1fe.zip | |
openrisc: Call setup_memory() earlier in the init sequence
The unflatten_and_copy_device_tree() function contains a call to
memblock_alloc(). This means that memblock is allocating memory before
any of the reserved memory regions are set aside in the setup_memory()
function which calls early_init_fdt_scan_reserved_mem(). Therefore,
there is a possibility for memblock to allocate from any of the
reserved memory regions.
Hence, move the call to setup_memory() to be earlier in the init
sequence so that the reserved memory regions are set aside before any
allocations are done using memblock.
Signed-off-by: Oreoluwa Babatunde <quic_obabatun@quicinc.com>
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/openrisc/kernel')
| -rw-r--r-- | arch/openrisc/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index 9cf7fb60441f..be56eaafc8b9 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -255,6 +255,9 @@ void calibrate_delay(void) void __init setup_arch(char **cmdline_p) { + /* setup memblock allocator */ + setup_memory(); + unflatten_and_copy_device_tree(); setup_cpuinfo(); @@ -278,9 +281,6 @@ void __init setup_arch(char **cmdline_p) } #endif - /* setup memblock allocator */ - setup_memory(); - /* paging_init() sets up the MMU and marks all pages as reserved */ paging_init(); |