Skip to content

Commit 4999348

Browse files
Jiri SlabyIngo Molnar
authored andcommitted
x86/entry/64: Use ENTRY() instead of ALIGN+GLOBAL for stub32_clone()
ALIGN+GLOBAL is effectively what ENTRY() does, so use ENTRY() which is dedicated for exactly this purpose -- global functions. Note that stub32_clone() is a C-like leaf function -- it has a standard call frame -- it only switches one argument and continues by jumping into C. Since each ENTRY() should be balanced by some END*() marker, we add a corresponding ENDPROC() to stub32_clone() too. Besides that, x86's custom GLOBAL macro is going to die very soon. Signed-off-by: Jiri Slaby <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent bd6be57 commit 4999348

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/entry/entry_64_compat.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ ENTRY(entry_INT80_compat)
341341
jmp restore_regs_and_iret
342342
END(entry_INT80_compat)
343343

344-
ALIGN
345-
GLOBAL(stub32_clone)
344+
ENTRY(stub32_clone)
346345
/*
347346
* The 32-bit clone ABI is: clone(..., int tls_val, int *child_tidptr).
348347
* The 64-bit clone ABI is: clone(..., int *child_tidptr, int tls_val).
@@ -352,3 +351,4 @@ GLOBAL(stub32_clone)
352351
*/
353352
xchg %r8, %rcx
354353
jmp sys_clone
354+
ENDPROC(stub32_clone)

0 commit comments

Comments
 (0)