diff options
author | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
---|---|---|
committer | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/x86/Kconfig | |
parent | x86/Kconfig: Deprecate DISCONTIGMEM support for 32-bit x86 (diff) | |
parent | Merge tag 'ceph-for-5.1-rc7' of git://github.com/ceph/ceph-client (diff) | |
download | kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.gz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 335d6e37f151..bd6f93ce0633 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1499,7 +1499,7 @@ config X86_CPA_STATISTICS depends on DEBUG_FS ---help--- Expose statistics about the Change Page Attribute mechanims, which - helps to determine the effectivness of preserving large and huge + helps to determine the effectiveness of preserving large and huge page mappings when mapping protections are changed. config ARCH_HAS_MEM_ENCRYPT |