diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:00:52 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:00:52 +0100 |
| commit | 2d6ce046e22eac405160e071f6c95b5ac6942437 (patch) | |
| tree | 83e885443c4ad3d56d2c692e48863b526b9f3ae2 /arch/arc | |
| parent | e60960c4ba278d3bbde28491f97a52b80b3164b5 (diff) | |
| parent | 1d146b1875fc901ae6bfe26ec8fed15b8dcd97ae (diff) | |
Merge tag 'v5.15.144' into fslc-5.15-2.2.x-imx
This is the 5.15.144 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 699ecf119641..110eb69e9bee 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -59,13 +59,13 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) low_mem_sz = size; in_use = 1; - memblock_add_node(base, size, 0); + memblock_add_node(base, size, 0, MEMBLOCK_NONE); } else { #ifdef CONFIG_HIGHMEM high_mem_start = base; high_mem_sz = size; in_use = 1; - memblock_add_node(base, size, 1); + memblock_add_node(base, size, 1, MEMBLOCK_NONE); memblock_reserve(base, size); #endif } |