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, apic: Fix apic=debug boot crash x86, hotplug: Serialize CPU hotplug to avoid bringup concurrency issues x86-32: Fix dummy trampoline-related inline stubs x86-32: Separate 1:1 pagetables from swapper_pg_dir x86, cpu: Fix regression in AMD errata checking code
Showing
- arch/x86/Kconfig 5 additions, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/pgtable_32.h 1 addition, 0 deletionsarch/x86/include/asm/pgtable_32.h
- arch/x86/include/asm/trampoline.h 4 additions, 1 deletionarch/x86/include/asm/trampoline.h
- arch/x86/kernel/apic/io_apic.c 2 additions, 0 deletionsarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/cpu/amd.c 1 addition, 1 deletionarch/x86/kernel/cpu/amd.c
- arch/x86/kernel/head_32.S 7 additions, 1 deletionarch/x86/kernel/head_32.S
- arch/x86/kernel/setup.c 2 additions, 0 deletionsarch/x86/kernel/setup.c
- arch/x86/kernel/smpboot.c 32 additions, 19 deletionsarch/x86/kernel/smpboot.c
- arch/x86/kernel/trampoline.c 18 additions, 0 deletionsarch/x86/kernel/trampoline.c
Loading
Please register or sign in to comment