Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1394963

[tip:x86/asm] x86/entry/32: Remove asmlinkage_protect()

Show all headers | View raw

Commit-ID:  0676b4e0a1940a6b7ae3156bd212ca9032a29c30
Gitweb:     http://git.kernel.org/tip/0676b4e0a1940a6b7ae3156bd212ca9032a29c30
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Wed, 4 May 2016 22:44:38 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 5 May 2016 08:37:31 +0200

x86/entry/32: Remove asmlinkage_protect()

Now that syscalls are called from C code, which copies the args to
new stack slots instead of overlaying pt_regs, asmlinkage_protect()
is no longer needed.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1462416278-11974-4-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/linkage.h | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 79327e9..0ccb26d 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -8,40 +8,6 @@
 
 #ifdef CONFIG_X86_32
 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
-
-/*
- * Make sure the compiler doesn't do anything stupid with the
- * arguments on the stack - they are owned by the *caller*, not
- * the callee. This just fools gcc into not spilling into them,
- * and keeps it from doing tailcall recursion and/or using the
- * stack slots for temporaries, since they are live and "used"
- * all the way to the end of the function.
- *
- * NOTE! On x86-64, all the arguments are in registers, so this
- * only matters on a 32-bit kernel.
- */
-#define asmlinkage_protect(n, ret, args...) \
-	__asmlinkage_protect##n(ret, ##args)
-#define __asmlinkage_protect_n(ret, args...) \
-	__asm__ __volatile__ ("" : "=r" (ret) : "0" (ret), ##args)
-#define __asmlinkage_protect0(ret) \
-	__asmlinkage_protect_n(ret)
-#define __asmlinkage_protect1(ret, arg1) \
-	__asmlinkage_protect_n(ret, "m" (arg1))
-#define __asmlinkage_protect2(ret, arg1, arg2) \
-	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2))
-#define __asmlinkage_protect3(ret, arg1, arg2, arg3) \
-	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3))
-#define __asmlinkage_protect4(ret, arg1, arg2, arg3, arg4) \
-	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \
-			      "m" (arg4))
-#define __asmlinkage_protect5(ret, arg1, arg2, arg3, arg4, arg5) \
-	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \
-			      "m" (arg4), "m" (arg5))
-#define __asmlinkage_protect6(ret, arg1, arg2, arg3, arg4, arg5, arg6) \
-	__asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \
-			      "m" (arg4), "m" (arg5), "m" (arg6))
-
 #endif /* CONFIG_X86_32 */
 
 #ifdef __ASSEMBLY__

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] Misc x86 cleanups Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
  [PATCH 1/3] x86: Don't save/restore EFLAGS on task switch Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
    Re: [PATCH 1/3] x86: Don't save/restore EFLAGS on task switch Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
    [tip:x86/asm] x86/entry, sched/x86: Don't save/restore EFLAGS on  task switch tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200
  [PATCH 2/3] x86-32: Remove GET_THREAD_INFO from entry code Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
    Re: [PATCH 2/3] x86-32: Remove GET_THREAD_INFO from entry code Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
    [tip:x86/asm] x86/entry/32: Remove GET_THREAD_INFO() from entry  code tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200
  [PATCH 3/3] x86-32: Remove asmlinkage_protect Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
    Re: [PATCH 3/3] x86-32: Remove asmlinkage_protect Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
    [tip:x86/asm] x86/entry/32: Remove asmlinkage_protect() tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200

csiph-web