diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 11:51:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 11:51:05 -0700 |
commit | d9d76778927dc953c553b83ab52287dfbd15ac6a (patch) | |
tree | c37938c2f3834b72fc7d1ee790774d5d82054986 /include/linux | |
parent | 7cc7e93519278401fcd9dce599296afb47e1f6ea (diff) | |
parent | aa61ee7b9ee3cb84c0d3a842b0d17937bf024c46 (diff) | |
download | linux-d9d76778927dc953c553b83ab52287dfbd15ac6a.tar.gz linux-d9d76778927dc953c553b83ab52287dfbd15ac6a.tar.bz2 linux-d9d76778927dc953c553b83ab52287dfbd15ac6a.zip |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm updates from Ingo Molnar:
"A handful of changes:
- two memory encryption related fixes
- don't display the kernel's virtual memory layout plaintext on
32-bit kernels either
- two simplifications"
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Remove the now redundant N_MEMORY check
dma-mapping: Fix dma_pgprot() for unencrypted coherent pages
x86: Don't let pgprot_modify() change the page encryption bit
x86/mm/kmmio: Use this_cpu_ptr() instead get_cpu_var() for kmmio_ctx
x86/mm/init/32: Stop printing the virtual memory layout
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions