Merge branch 'x86-fixes-for-linus' of...
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pvclock: Remove leftover scale_delta() function x86, apic: Remove double #include x86: Adjust section annotations in AMD Fam10 MMCONF enabling code x86, UV: Update node controller MMRs x86: Remove unnecessary casts of void ptr returning alloc function return values x86: Address gcc4.6 "set but not used" warnings in apic.h x86, mm: Fix section mismatch in tlb.c
Showing
- arch/x86/include/asm/apic.h 5 additions, 5 deletionsarch/x86/include/asm/apic.h
- arch/x86/include/asm/uv/uv_mmrs.h 96 additions, 93 deletionsarch/x86/include/asm/uv/uv_mmrs.h
- arch/x86/kernel/apic/apic.c 0 additions, 1 deletionarch/x86/kernel/apic/apic.c
- arch/x86/kernel/apic/x2apic_uv_x.c 6 additions, 6 deletionsarch/x86/kernel/apic/x2apic_uv_x.c
- arch/x86/kernel/microcode_amd.c 1 addition, 1 deletionarch/x86/kernel/microcode_amd.c
- arch/x86/kernel/mmconf-fam10h_64.c 4 additions, 3 deletionsarch/x86/kernel/mmconf-fam10h_64.c
- arch/x86/kernel/pvclock.c 0 additions, 38 deletionsarch/x86/kernel/pvclock.c
- arch/x86/mm/tlb.c 1 addition, 1 deletionarch/x86/mm/tlb.c
- arch/x86/platform/uv/tlb_uv.c 6 additions, 7 deletionsarch/x86/platform/uv/tlb_uv.c
Loading
Please register or sign in to comment