Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner: "This lot contains: - Some fixups for the fallout of the topology consolidation which unearthed AMD/Intel inconsistencies - Documentation for the x86 topology management - Support for AMD advanced power management bits - Two simple cleanups removing duplicated code" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu: Add advanced power management bits x86/thread_info: Merge two !__ASSEMBLY__ sections x86/cpufreq: Remove duplicated TDP MSR macro definitions x86/Documentation: Start documenting x86 topology x86/cpu: Get rid of compute_unit_id perf/x86/amd: Cleanup Fam10h NB event constraints x86/topology: Fix AMD core count
No related branches found
No related tags found
Showing
- Documentation/x86/topology.txt 208 additions, 0 deletionsDocumentation/x86/topology.txt
- arch/x86/events/amd/core.c 18 additions, 3 deletionsarch/x86/events/amd/core.c
- arch/x86/events/perf_event.h 5 additions, 0 deletionsarch/x86/events/perf_event.h
- arch/x86/include/asm/msr-index.h 1 addition, 7 deletionsarch/x86/include/asm/msr-index.h
- arch/x86/include/asm/processor.h 0 additions, 2 deletionsarch/x86/include/asm/processor.h
- arch/x86/include/asm/smp.h 1 addition, 0 deletionsarch/x86/include/asm/smp.h
- arch/x86/include/asm/thread_info.h 2 additions, 4 deletionsarch/x86/include/asm/thread_info.h
- arch/x86/kernel/amd_nb.c 2 additions, 4 deletionsarch/x86/kernel/amd_nb.c
- arch/x86/kernel/cpu/amd.c 4 additions, 8 deletionsarch/x86/kernel/cpu/amd.c
- arch/x86/kernel/cpu/powerflags.c 2 additions, 0 deletionsarch/x86/kernel/cpu/powerflags.c
- arch/x86/kernel/smpboot.c 1 addition, 1 deletionarch/x86/kernel/smpboot.c
- arch/x86/ras/mce_amd_inj.c 2 additions, 1 deletionarch/x86/ras/mce_amd_inj.c
Loading
Please register or sign in to comment