diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-07-26 08:23:27 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-07-26 08:23:27 +0200 |
| commit | 810fa7efe0e50693e9ef81d182c29be067fb84d6 (patch) | |
| tree | 589d90c8ec4385aae77003e8499650837ba7139a /arch/s390/mm/init.c | |
| parent | fd2b2c57ec2020ae1b5e24717a876c71e31e5ab8 (diff) | |
| parent | cd774b9076845312caf76ad52523bd9219e89ae1 (diff) | |
| download | linux-stable-810fa7efe0e50693e9ef81d182c29be067fb84d6.tar.gz linux-stable-810fa7efe0e50693e9ef81d182c29be067fb84d6.tar.bz2 linux-stable-810fa7efe0e50693e9ef81d182c29be067fb84d6.zip | |
Merge branch 'tlb-flushing' into features
Add the TLB flushing changes via a tip branch to ease merging with
the KVM tree.
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 8111694ce55a..3aee54b2ba60 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -137,6 +137,8 @@ void __init mem_init(void) free_all_bootmem(); setup_zero_pages(); /* Setup zeroed pages. */ + cmma_init_nodat(); + mem_init_print_info(NULL); } |