Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base

Conflicts: arch/x86/kernel/cpu/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-09-26 18:16:26 +00:00 · 2017-12-17 13:04:28 +01:00 · 2017-12-17 13:04:28 +01:00 · 650400b2cc
commit 650400b2cc
parent 0fd2e9c53d fec8f5ae17
19 changed files with 613 additions and 522 deletions
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/entry/syscalls/Makefile
+++ b/arch/x86/entry/syscalls/Makefile
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/mm/gup.c
+++ b/mm/gup.c
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
--- a/mm/sparse.c
+++ b/mm/sparse.c
--- a/tools/testing/selftests/x86/ldt_gdt.c
+++ b/tools/testing/selftests/x86/ldt_gdt.c
--- a/tools/testing/selftests/x86/protection_keys.c
+++ b/tools/testing/selftests/x86/protection_keys.c