Merge branch 'x86/cleanups' into x86/mm

Merge recent cleanups to the x86 MM code to resolve a conflict. Conflicts: arch/x86/mm/fault.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-10-14 05:55:17 +00:00 · 2021-02-12 13:39:32 +01:00 · 2021-02-12 13:39:32 +01:00 · 40c1fa52cd
commit 40c1fa52cd
parent c46f52231e 3228e1dc80
15 changed files with 60 additions and 111 deletions
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
--- a/arch/x86/include/asm/vm86.h
+++ b/arch/x86/include/asm/vm86.h
--- a/arch/x86/include/uapi/asm/vm86.h
+++ b/arch/x86/include/uapi/asm/vm86.h
--- a/arch/x86/kernel/cpu/mtrr/cleanup.c
+++ b/arch/x86/kernel/cpu/mtrr/cleanup.c
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
--- a/arch/x86/kernel/pci-iommu_table.c
+++ b/arch/x86/kernel/pci-iommu_table.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c