diff options
| author | Jan Beulich <JBeulich@suse.com> | 2011-11-29 11:24:10 +0000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-05 17:24:43 +0100 |
| commit | f6b2bc847641ea38e2655c8424fef5d2d19f35f9 (patch) | |
| tree | 47f7d2ebb9cd1434b5fd8ef0113a4b0cbb0741a2 /arch/x86/ia32 | |
| parent | 46db09d3fd847f185a7d23a96bc8fe7a4be0cd05 (diff) | |
| download | linux-f6b2bc847641ea38e2655c8424fef5d2d19f35f9.tar.gz linux-f6b2bc847641ea38e2655c8424fef5d2d19f35f9.tar.bz2 linux-f6b2bc847641ea38e2655c8424fef5d2d19f35f9.zip | |
x86-64: Cleanup some assembly entry points
system_call_after_swapgs doesn't really benefit from forcing
alignment from it - quite the opposite, native code needlessly
so far got a big NOP instruction inserted in front of it. Xen
being the only user of the separate entry point can well live
with the branch going to three bytes into a cache line.
The compatibility mode ptregs entry points for one can make use
of the GLOBAL() macro, and should be suitably aligned. Their
shared continuation point (ia32_ptregs_common) otoh doesn't need
to be global at all, but should continue to be properly aligned.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/4ED4CEEA020000780006407D@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 0d5c279f3732..3e274564f6bf 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -453,8 +453,8 @@ quiet_ni_syscall: CFI_ENDPROC .macro PTREGSCALL label, func, arg - .globl \label -\label: + ALIGN +GLOBAL(\label) leaq \func(%rip),%rax leaq -ARGOFFSET+8(%rsp),\arg /* 8 for return address */ jmp ia32_ptregs_common @@ -471,7 +471,8 @@ quiet_ni_syscall: PTREGSCALL stub32_vfork, sys_vfork, %rdi PTREGSCALL stub32_iopl, sys_iopl, %rsi -ENTRY(ia32_ptregs_common) + ALIGN +ia32_ptregs_common: popq %r11 CFI_ENDPROC CFI_STARTPROC32 simple |