Merge branch 'x86/pat' into x86/urgent
Merge reason:
Suresh Siddha (1):
x86, pat: don't use rb-tree based lookup in reserve_memtype()
... requires previous x86/pat commits already pushed to Linus.
Signed-off-by: 
H. Peter Anvin <hpa@zytor.com>
Showing
- arch/ia64/Kconfig 4 additions, 0 deletionsarch/ia64/Kconfig
- arch/x86/Kconfig 4 additions, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/cacheflush.h 52 additions, 2 deletionsarch/x86/include/asm/cacheflush.h
- arch/x86/include/asm/iomap.h 6 additions, 3 deletionsarch/x86/include/asm/iomap.h
- arch/x86/include/asm/mtrr.h 6 additions, 0 deletionsarch/x86/include/asm/mtrr.h
- arch/x86/include/asm/pat.h 5 additions, 0 deletionsarch/x86/include/asm/pat.h
- arch/x86/kernel/apic/ipi.c 1 addition, 1 deletionarch/x86/kernel/apic/ipi.c
- arch/x86/kernel/cpu/amd.c 21 additions, 16 deletionsarch/x86/kernel/cpu/amd.c
- arch/x86/kernel/cpu/bugs.c 5 additions, 5 deletionsarch/x86/kernel/cpu/bugs.c
- arch/x86/kernel/cpu/bugs_64.c 1 addition, 1 deletionarch/x86/kernel/cpu/bugs_64.c
- arch/x86/kernel/cpu/common.c 5 additions, 5 deletionsarch/x86/kernel/cpu/common.c
- arch/x86/kernel/cpu/cyrix.c 12 additions, 7 deletionsarch/x86/kernel/cpu/cyrix.c
- arch/x86/kernel/cpu/hypervisor.c 2 additions, 3 deletionsarch/x86/kernel/cpu/hypervisor.c
- arch/x86/kernel/cpu/intel.c 6 additions, 5 deletionsarch/x86/kernel/cpu/intel.c
- arch/x86/kernel/cpu/intel_cacheinfo.c 60 additions, 56 deletionsarch/x86/kernel/cpu/intel_cacheinfo.c
- arch/x86/kernel/cpu/mtrr/amd.c 51 additions, 46 deletionsarch/x86/kernel/cpu/mtrr/amd.c
- arch/x86/kernel/cpu/mtrr/centaur.c 35 additions, 133 deletionsarch/x86/kernel/cpu/mtrr/centaur.c
- arch/x86/kernel/cpu/mtrr/cleanup.c 195 additions, 195 deletionsarch/x86/kernel/cpu/mtrr/cleanup.c
- arch/x86/kernel/cpu/mtrr/cyrix.c 51 additions, 43 deletionsarch/x86/kernel/cpu/mtrr/cyrix.c
- arch/x86/kernel/cpu/mtrr/generic.c 169 additions, 135 deletionsarch/x86/kernel/cpu/mtrr/generic.c
Loading
Please register or sign in to comment