diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-10 11:07:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-10 11:07:47 -0700 |
| commit | 315581a2fe6fbc7394f27749b3e30d1f0f460dd0 (patch) | |
| tree | 4d99a55f5ac182b95c3152458b6a25168ff229a8 | |
| parent | aec742e8e1cf05114530bdef8051238b6dbb4052 (diff) | |
| parent | 97b1d23f7bcbee00a5b85bf2c022c612ea67429d (diff) | |
| download | linux-315581a2fe6fbc7394f27749b3e30d1f0f460dd0.tar.bz2 | |
Merge tag 'metag-for-v4.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture fix from James Hogan:
"A single fix for a boot crash since a commit in the merge window.
Metag was unusual in calling show_mem() early, before setup_per_cpu_pageset(),
which is no longer safe. It doesn't add much value to the log, so the
fix just drops the call"
* tag 'metag-for-v4.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Drop show_mem() from mem_init()
| -rw-r--r-- | arch/metag/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c index 11fa51c89617..c0ec116b3993 100644 --- a/arch/metag/mm/init.c +++ b/arch/metag/mm/init.c @@ -390,7 +390,6 @@ void __init mem_init(void) free_all_bootmem(); mem_init_print_info(NULL); - show_mem(0); } void free_initmem(void) |