Skip to content

Commit

Permalink
m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_l…
Browse files Browse the repository at this point in the history
…ow_pfn

If max_pfn is not initialized, the various /proc/kpage* files are empty,
and selftests/vm/mlock2-tests will fail. max_pfn is also used by the
block layer to calculate DMA masks.

Switch from init_bootmem_node() to init_bootmem(), as there's only one
memory node on Sun-3. This will initialize min_low_pfn and max_low_pfn,
which was also not done before.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Geert Uytterhoeven committed Nov 22, 2015
1 parent 4722b8f commit c73ec31
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/m68k/sun3/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start,
memory_end = memory_end & PAGE_MASK;

start_page = __pa(memory_start) >> PAGE_SHIFT;
num_pages = __pa(memory_end) >> PAGE_SHIFT;
max_pfn = num_pages = __pa(memory_end) >> PAGE_SHIFT;

high_memory = (void *)memory_end;
availmem = memory_start;

m68k_setup_node(0);
availmem += init_bootmem_node(NODE_DATA(0), start_page, 0, num_pages);
availmem += init_bootmem(start_page, num_pages);
availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;

free_bootmem(__pa(availmem), memory_end - (availmem));
Expand Down

0 comments on commit c73ec31

Please sign in to comment.