diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:54:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:54:40 +0100 |
| commit | a62d2d44902cf1222b5ac41ff1f61167a010cd6b (patch) | |
| tree | fd3740b483e806c03896a59a6189e5959c899579 /arch/s390/mm/pgalloc.c | |
| parent | f4b614adbf3aceaa4dab034665c379352777de39 (diff) | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
| download | kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.tar.gz kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.tar.bz2 kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.zip | |
Merge 4.20-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/mm/pgalloc.c')
| -rw-r--r-- | arch/s390/mm/pgalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 76d89ee8b428..814f26520aa2 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -101,6 +101,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end) mm->context.asce_limit = _REGION1_SIZE; mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_REGION2; + mm_inc_nr_puds(mm); } else { crst_table_init(table, _REGION1_ENTRY_EMPTY); pgd_populate(mm, (pgd_t *) table, (p4d_t *) pgd); |