Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- Documentation/x86/x86_64/mm.txt 1 addition, 1 deletionDocumentation/x86/x86_64/mm.txt
- arch/x86/Kconfig 0 additions, 1 deletionarch/x86/Kconfig
- arch/x86/entry/syscalls/Makefile 2 additions, 2 deletionsarch/x86/entry/syscalls/Makefile
- arch/x86/include/asm/cpufeatures.h 272 additions, 273 deletionsarch/x86/include/asm/cpufeatures.h
- arch/x86/include/asm/pgtable_types.h 1 addition, 2 deletionsarch/x86/include/asm/pgtable_types.h
- arch/x86/kernel/Makefile 2 additions, 1 deletionarch/x86/kernel/Makefile
- arch/x86/kernel/cpu/cpuid-deps.c 11 additions, 15 deletionsarch/x86/kernel/cpu/cpuid-deps.c
- arch/x86/kernel/head_64.S 6 additions, 5 deletionsarch/x86/kernel/head_64.S
- arch/x86/mm/init_64.c 5 additions, 5 deletionsarch/x86/mm/init_64.c
- arch/x86/mm/kasan_init_64.c 80 additions, 21 deletionsarch/x86/mm/kasan_init_64.c
- arch/x86/xen/mmu_pv.c 60 additions, 99 deletionsarch/x86/xen/mmu_pv.c
- include/linux/bitops.h 0 additions, 26 deletionsinclude/linux/bitops.h
- include/linux/mm.h 1 addition, 1 deletioninclude/linux/mm.h
- include/linux/mmzone.h 5 additions, 1 deletioninclude/linux/mmzone.h
- mm/gup.c 58 additions, 39 deletionsmm/gup.c
- mm/page_alloc.c 10 additions, 0 deletionsmm/page_alloc.c
- mm/sparse.c 11 additions, 6 deletionsmm/sparse.c
- tools/testing/selftests/x86/ldt_gdt.c 70 additions, 18 deletionstools/testing/selftests/x86/ldt_gdt.c
- tools/testing/selftests/x86/protection_keys.c 18 additions, 6 deletionstools/testing/selftests/x86/protection_keys.c
Loading
Please register or sign in to comment