diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 08:39:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 08:39:38 -0700 |
| commit | 3d7e5fc37f91c3ad4974262e173d9ba36139652a (patch) | |
| tree | 471484562a2c0341dbee0b4d2e10fdfd5d049c58 /arch/x86/ia32 | |
| parent | 6924a4672dd07dbe11d76fe597d17a092434232f (diff) | |
| parent | f69fa9a91f60fff6f2d8b658b7d84d235d9d89b7 (diff) | |
| download | talos-op-linux-3d7e5fc37f91c3ad4974262e173d9ba36139652a.tar.gz talos-op-linux-3d7e5fc37f91c3ad4974262e173d9ba36139652a.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:
"Main changes:
- Apply low level mutex optimization on x86-64, by Wedson Almeida
Filho.
- Change bitops to be naturally 'long', by H Peter Anvin.
- Add TSX-NI opcodes support to the x86 (instrumentation) decoder, by
Masami Hiramatsu.
- Add clang compatibility adjustments/workarounds, by Jan-Simon
Möller"
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, doc: Update uaccess.h comment to reflect clang changes
x86, asm: Fix a compilation issue with clang
x86, asm: Extend definitions of _ASM_* with a raw format
x86, insn: Add new opcodes as of June, 2013
x86/ia32/asm: Remove unused argument in macro
x86, bitops: Change bitops to be native operand size
x86: Use asm-goto to implement mutex fast path on x86-64
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 474dc1b59f72..4299eb05023c 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -452,7 +452,7 @@ ia32_badsys: CFI_ENDPROC - .macro PTREGSCALL label, func, arg + .macro PTREGSCALL label, func ALIGN GLOBAL(\label) leaq \func(%rip),%rax |
