Skip to content

Commit

Permalink
metag: Drop show_mem() from mem_init()
Browse files Browse the repository at this point in the history
The recent commit 599d0c9 ("mm, vmscan: move LRU lists to node"),
changed memory management code so that show_mem() is no longer safe to
call prior to setup_per_cpu_pageset(), as pgdat->per_cpu_nodestats will
still be NULL. This causes an oops on metag due to the call to
show_mem() from mem_init():

  node_page_state_snapshot(...) + 0x48
  pgdat_reclaimable(struct pglist_data * pgdat = 0x402517a0)
  show_free_areas(unsigned int filter = 0) + 0x2cc
  show_mem(unsigned int filter = 0) + 0x18
  mem_init()
  mm_init()
  start_kernel() + 0x204

This wasn't a problem before with zone_reclaimable() as zone_pcp_init()
was already setting zone->pageset to &boot_pageset, via setup_arch() and
paging_init(), which happens before mm_init():

  zone_pcp_init(...)
  free_area_init_core(...) + 0x138
  free_area_init_node(int nid = 0, ...) + 0x1a0
  free_area_init_nodes(...) + 0x440
  paging_init(unsigned long mem_end = 0x4fe00000) + 0x378
  setup_arch(char ** cmdline_p = 0x4024e038) + 0x2b8
  start_kernel() + 0x54

No other arches appear to call show_mem() during boot, and it doesn't
really add much value to the log, so lets just drop it from mem_init().

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Cc: linux-metag@vger.kernel.org
  • Loading branch information
James Hogan committed Aug 9, 2016
1 parent 29b4817 commit 97b1d23
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/metag/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ void __init mem_init(void)

free_all_bootmem();
mem_init_print_info(NULL);
show_mem(0);
}

void free_initmem(void)
Expand Down

0 comments on commit 97b1d23

Please sign in to comment.