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>
No related branches found
No related tags found
Showing
- arch/x86/Kconfig 1 addition, 1 deletionarch/x86/Kconfig
- arch/x86/include/asm/irq.h 0 additions, 2 deletionsarch/x86/include/asm/irq.h
- arch/x86/include/asm/page_64_types.h 1 addition, 1 deletionarch/x86/include/asm/page_64_types.h
- arch/x86/include/asm/pgtable_types.h 0 additions, 2 deletionsarch/x86/include/asm/pgtable_types.h
- arch/x86/include/asm/vm86.h 0 additions, 1 deletionarch/x86/include/asm/vm86.h
- arch/x86/include/uapi/asm/vm86.h 2 additions, 2 deletionsarch/x86/include/uapi/asm/vm86.h
- arch/x86/kernel/cpu/mtrr/cleanup.c 2 additions, 2 deletionsarch/x86/kernel/cpu/mtrr/cleanup.c
- arch/x86/kernel/cpu/mtrr/generic.c 0 additions, 1 deletionarch/x86/kernel/cpu/mtrr/generic.c
- arch/x86/kernel/cpu/mtrr/mtrr.c 0 additions, 2 deletionsarch/x86/kernel/cpu/mtrr/mtrr.c
- arch/x86/kernel/pci-iommu_table.c 0 additions, 3 deletionsarch/x86/kernel/pci-iommu_table.c
- arch/x86/kernel/ptrace.c 38 additions, 8 deletionsarch/x86/kernel/ptrace.c
- arch/x86/kernel/sys_x86_64.c 2 additions, 6 deletionsarch/x86/kernel/sys_x86_64.c
- arch/x86/kernel/vm86_32.c 14 additions, 48 deletionsarch/x86/kernel/vm86_32.c
- arch/x86/mm/fault.c 0 additions, 30 deletionsarch/x86/mm/fault.c
- arch/x86/mm/mmio-mod.c 0 additions, 2 deletionsarch/x86/mm/mmio-mod.c
Loading
Please register or sign in to comment