diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-11-17 21:35:44 +0100 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-11-17 21:35:44 +0100 |
| commit | 7701f264a756d41c2b663c3b745dd81efc875515 (patch) | |
| tree | 9b7743c4c2a5ed5146b99c9c8669d9f54382bc32 /arch/mips/kernel | |
| parent | a3fb655027c33a9281d3b813798b15bdf1e75d43 (diff) | |
| parent | ac3b57adf87ad9bac7e33ca26bbbb13fae1ed62b (diff) | |
| download | linux-7701f264a756d41c2b663c3b745dd81efc875515.tar.bz2 | |
Merge tag 'mips_fixes_5.10_1' into mips-next
Pull in mips-fixes to get memblock fix.
- fix bug preventing booting on several platforms
- fix for build error, when modules need has_transparent_hugepage
- fix for memleak in alchemy clk setup
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 0d4253208bde..ca579deef939 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -262,8 +262,8 @@ static void __init bootmem_init(void) static void __init bootmem_init(void) { phys_addr_t ramstart, ramend; - phys_addr_t start, end; - u64 i; + unsigned long start, end; + int i; ramstart = memblock_start_of_DRAM(); ramend = memblock_end_of_DRAM(); @@ -300,7 +300,7 @@ static void __init bootmem_init(void) min_low_pfn = ARCH_PFN_OFFSET; max_pfn = PFN_DOWN(ramend); - for_each_mem_range(i, &start, &end) { + for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, NULL) { /* * Skip highmem here so we get an accurate max_low_pfn if low * memory stops short of high memory. |