diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 19:46:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 19:46:27 +0200 |
commit | da8347969f324db5f572581397d9b3a8e108cda4 (patch) | |
tree | 7df2ea8968ecb92e307bbffdbe8f9bcd0c79c36a /arch/x86/include/asm/sta2x11.h | |
parent | Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | x86: Unspaghettize do_trap() (diff) | |
download | linux-da8347969f324db5f572581397d9b3a8e108cda4.tar.xz linux-da8347969f324db5f572581397d9b3a8e108cda4.zip |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/asm changes from Ingo Molnar:
"The one change that stands out is the alternatives patching change
that prevents us from ever patching back instructions from SMP to UP:
this simplifies things and speeds up CPU hotplug.
Other than that it's smaller fixes, cleanups and improvements."
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Unspaghettize do_trap()
x86_64: Work around old GAS bug
x86: Use REP BSF unconditionally
x86: Prefer TZCNT over BFS
x86/64: Adjust types of temporaries used by ffs()/fls()/fls64()
x86: Drop unnecessary kernel_eflags variable on 64-bit
x86/smp: Don't ever patch back to UP if we unplug cpus
Diffstat (limited to 'arch/x86/include/asm/sta2x11.h')
0 files changed, 0 insertions, 0 deletions