diff options
| author | Linus Torvalds <[email protected]> | 2020-08-29 12:51:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-08-29 12:51:58 -0700 |
| commit | 1b46b921b0b92bfc507d29a39f1b265c48ed45be (patch) | |
| tree | 88add698c5a91dc5b9496392fe7e6dca1508cc38 /arch/s390/mm/vmem.c | |
| parent | c8b5563abe02c5e9abdd6a74043c651a9ec31e9e (diff) | |
| parent | bffc2f7aa96343f91931272d7a8a2d8d925e1ab2 (diff) | |
Merge tag 's390-5.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Disable preemption trace in percpu macros since the lockdep code
itself uses percpu variables now and it causes recursions.
- Fix kernel space 4-level paging broken by recent vmem rework.
* tag 's390-5.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/vmem: fix vmem_add_range for 4-level paging
s390: don't trace preemption in percpu macros
Diffstat (limited to 'arch/s390/mm/vmem.c')
| -rw-r--r-- | arch/s390/mm/vmem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 1aed1a4dfc2d..eddf71c22875 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -402,6 +402,7 @@ static int modify_p4d_table(pgd_t *pgd, unsigned long addr, unsigned long end, pud = vmem_crst_alloc(_REGION3_ENTRY_EMPTY); if (!pud) goto out; + p4d_populate(&init_mm, p4d, pud); } ret = modify_pud_table(p4d, addr, next, add, direct); if (ret) |