diff options
| author | Richard Weinberger <richard@nod.at> | 2011-05-23 22:18:05 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-24 12:33:35 (GMT) |
| commit | 1b4ac2a935aaf194241a2f4165d6407ba9650e1a (patch) | |
| tree | f92e0154dda7640657b9cf65986ea305fa99ca0f /arch | |
| parent | 3a3679078aed2c451ebc32836bbd3b8219a65e01 (diff) | |
| download | linux-fsl-qoriq-1b4ac2a935aaf194241a2f4165d6407ba9650e1a.tar.xz | |
x86: Get rid of asmregparm
As UML does no longer need asmregparm we can remove it.
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: namhyung@gmail.com
Cc: davem@davemloft.net
Cc: fweisbec@gmail.com
Cc: dhowells@redhat.com
Link: http://lkml.kernel.org/r/%3C1306189085-29896-1-git-send-email-richard%40nod.at%3E
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/linkage.h | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index 12d55e7..4814297 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -8,11 +8,6 @@ #ifdef CONFIG_X86_32 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) -/* - * For 32-bit UML - mark functions implemented in assembly that use - * regparm input parameters: - */ -#define asmregparm __attribute__((regparm(3))) /* * Make sure the compiler doesn't do anything stupid with the diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index f65e5b5..807c2a2 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all. */ -asmregparm long syscall_trace_enter(struct pt_regs *regs) +long syscall_trace_enter(struct pt_regs *regs) { long ret = 0; @@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs) return ret ?: regs->orig_ax; } -asmregparm void syscall_trace_leave(struct pt_regs *regs) +void syscall_trace_leave(struct pt_regs *regs) { bool step; |