Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / entry / entry_64_compat.S

diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index d8468ba24be069609a46e6f96f06d2983e81d2a1..e26c25ca77565938fb9ca4d16b08c3bcf4f48264 100644 (file)
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -340,8 +340,7 @@ ENTRY(entry_INT80_compat)
        jmp     restore_regs_and_iret
 END(entry_INT80_compat)
 
-       ALIGN
-GLOBAL(stub32_clone)
+ENTRY(stub32_clone)
        /*
         * The 32-bit clone ABI is: clone(..., int tls_val, int *child_tidptr).
         * The 64-bit clone ABI is: clone(..., int *child_tidptr, int tls_val).
@@ -351,3 +350,4 @@ GLOBAL(stub32_clone)
         */
        xchg    %r8, %rcx
        jmp     sys_clone
+ENDPROC(stub32_clone)