Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Misc fixes from all around the map, plus a commit that introduces a new header of Intel model name symbols (unused) that will make the next merge window easier" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/ioapic: Fix incorrect pointers in ioapic_setup_resources() x86/entry/traps: Don't force in_interrupt() to return true in IST handlers x86/cpu/AMD: Extend X86_FEATURE_TOPOEXT workaround to newer models x86/cpu/intel: Introduce macros for Intel family numbers x86, build: copy ldlinux.c32 to image.iso x86/msr: Use the proper trace point conditional for writes
Showing
- arch/x86/boot/Makefile 3 additions, 0 deletionsarch/x86/boot/Makefile
- arch/x86/include/asm/intel-family.h 68 additions, 0 deletionsarch/x86/include/asm/intel-family.h
- arch/x86/include/asm/msr.h 2 additions, 2 deletionsarch/x86/include/asm/msr.h
- arch/x86/kernel/apic/io_apic.c 1 addition, 1 deletionarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/cpu/amd.c 2 additions, 2 deletionsarch/x86/kernel/cpu/amd.c
- arch/x86/kernel/traps.c 10 additions, 10 deletionsarch/x86/kernel/traps.c
Please register or sign in to comment