aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/ptrace.c8
-rw-r--r--arch/x86/um/asm/ptrace.h4
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 678c0ada3b3c..eb1c87f0b03b 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1488,15 +1488,11 @@ long syscall_trace_enter(struct pt_regs *regs)
1488 trace_sys_enter(regs, regs->orig_ax); 1488 trace_sys_enter(regs, regs->orig_ax);
1489 1489
1490 if (IS_IA32) 1490 if (IS_IA32)
1491 audit_syscall_entry(AUDIT_ARCH_I386, 1491 audit_syscall_entry(regs->orig_ax, regs->bx, regs->cx,
1492 regs->orig_ax,
1493 regs->bx, regs->cx,
1494 regs->dx, regs->si); 1492 regs->dx, regs->si);
1495#ifdef CONFIG_X86_64 1493#ifdef CONFIG_X86_64
1496 else 1494 else
1497 audit_syscall_entry(AUDIT_ARCH_X86_64, 1495 audit_syscall_entry(regs->orig_ax, regs->di, regs->si,
1498 regs->orig_ax,
1499 regs->di, regs->si,
1500 regs->dx, regs->r10); 1496 regs->dx, regs->r10);
1501#endif 1497#endif
1502 1498
diff --git a/arch/x86/um/asm/ptrace.h b/arch/x86/um/asm/ptrace.h
index 54f8102ccde5..e59eef20647b 100644
--- a/arch/x86/um/asm/ptrace.h
+++ b/arch/x86/um/asm/ptrace.h
@@ -47,8 +47,6 @@ struct user_desc;
47 47
48#ifdef CONFIG_X86_32 48#ifdef CONFIG_X86_32
49 49
50#define HOST_AUDIT_ARCH AUDIT_ARCH_I386
51
52extern int ptrace_get_thread_area(struct task_struct *child, int idx, 50extern int ptrace_get_thread_area(struct task_struct *child, int idx,
53 struct user_desc __user *user_desc); 51 struct user_desc __user *user_desc);
54 52
@@ -57,8 +55,6 @@ extern int ptrace_set_thread_area(struct task_struct *child, int idx,
57 55
58#else 56#else
59 57
60#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
61
62#define PT_REGS_R8(r) UPT_R8(&(r)->regs) 58#define PT_REGS_R8(r) UPT_R8(&(r)->regs)
63#define PT_REGS_R9(r) UPT_R9(&(r)->regs) 59#define PT_REGS_R9(r) UPT_R9(&(r)->regs)
64#define PT_REGS_R10(r) UPT_R10(&(r)->regs) 60#define PT_REGS_R10(r) UPT_R10(&(r)->regs)