diff options
author | Brian Gerst <brgerst@gmail.com> | 2016-05-04 22:44:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 02:37:31 -0400 |
commit | 0676b4e0a1940a6b7ae3156bd212ca9032a29c30 (patch) | |
tree | 9eb07f72fe304bef8aff22bc6ea54bfe756c62d7 | |
parent | 1e17880371f85d3d866962e04ba3567c0654a125 (diff) |
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>
-rw-r--r-- | arch/x86/include/asm/linkage.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index 79327e9483a3..0ccb26dda126 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h | |||
@@ -8,40 +8,6 @@ | |||
8 | 8 | ||
9 | #ifdef CONFIG_X86_32 | 9 | #ifdef CONFIG_X86_32 |
10 | #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) | 10 | #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) |
11 | |||
12 | /* | ||
13 | * Make sure the compiler doesn't do anything stupid with the | ||
14 | * arguments on the stack - they are owned by the *caller*, not | ||
15 | * the callee. This just fools gcc into not spilling into them, | ||
16 | * and keeps it from doing tailcall recursion and/or using the | ||
17 | * stack slots for temporaries, since they are live and "used" | ||
18 | * all the way to the end of the function. | ||
19 | * | ||
20 | * NOTE! On x86-64, all the arguments are in registers, so this | ||
21 | * only matters on a 32-bit kernel. | ||
22 | */ | ||
23 | #define asmlinkage_protect(n, ret, args...) \ | ||
24 | __asmlinkage_protect##n(ret, ##args) | ||
25 | #define __asmlinkage_protect_n(ret, args...) \ | ||
26 | __asm__ __volatile__ ("" : "=r" (ret) : "0" (ret), ##args) | ||
27 | #define __asmlinkage_protect0(ret) \ | ||
28 | __asmlinkage_protect_n(ret) | ||
29 | #define __asmlinkage_protect1(ret, arg1) \ | ||
30 | __asmlinkage_protect_n(ret, "m" (arg1)) | ||
31 | #define __asmlinkage_protect2(ret, arg1, arg2) \ | ||
32 | __asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2)) | ||
33 | #define __asmlinkage_protect3(ret, arg1, arg2, arg3) \ | ||
34 | __asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3)) | ||
35 | #define __asmlinkage_protect4(ret, arg1, arg2, arg3, arg4) \ | ||
36 | __asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \ | ||
37 | "m" (arg4)) | ||
38 | #define __asmlinkage_protect5(ret, arg1, arg2, arg3, arg4, arg5) \ | ||
39 | __asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \ | ||
40 | "m" (arg4), "m" (arg5)) | ||
41 | #define __asmlinkage_protect6(ret, arg1, arg2, arg3, arg4, arg5, arg6) \ | ||
42 | __asmlinkage_protect_n(ret, "m" (arg1), "m" (arg2), "m" (arg3), \ | ||
43 | "m" (arg4), "m" (arg5), "m" (arg6)) | ||
44 | |||
45 | #endif /* CONFIG_X86_32 */ | 11 | #endif /* CONFIG_X86_32 */ |
46 | 12 | ||
47 | #ifdef __ASSEMBLY__ | 13 | #ifdef __ASSEMBLY__ |