diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-29 12:51:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-29 12:51:58 -0700 |
| commit | 1b46b921b0b92bfc507d29a39f1b265c48ed45be (patch) | |
| tree | 88add698c5a91dc5b9496392fe7e6dca1508cc38 /kernel | |
| 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 'kernel')
0 files changed, 0 insertions, 0 deletions