diff options
Diffstat (limited to 'arch/ia64/kernel/ptrace.c')
-rw-r--r-- | arch/ia64/kernel/ptrace.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 9daa87fdb018..b61afbbe076f 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
@@ -1250,13 +1250,8 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3, | |||
1250 | long syscall; | 1250 | long syscall; |
1251 | int arch; | 1251 | int arch; |
1252 | 1252 | ||
1253 | if (IS_IA32_PROCESS(®s)) { | 1253 | syscall = regs.r15; |
1254 | syscall = regs.r1; | 1254 | arch = AUDIT_ARCH_IA64; |
1255 | arch = AUDIT_ARCH_I386; | ||
1256 | } else { | ||
1257 | syscall = regs.r15; | ||
1258 | arch = AUDIT_ARCH_IA64; | ||
1259 | } | ||
1260 | 1255 | ||
1261 | audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3); | 1256 | audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3); |
1262 | } | 1257 | } |
@@ -2172,11 +2167,6 @@ static const struct user_regset_view user_ia64_view = { | |||
2172 | 2167 | ||
2173 | const struct user_regset_view *task_user_regset_view(struct task_struct *tsk) | 2168 | const struct user_regset_view *task_user_regset_view(struct task_struct *tsk) |
2174 | { | 2169 | { |
2175 | #ifdef CONFIG_IA32_SUPPORT | ||
2176 | extern const struct user_regset_view user_ia32_view; | ||
2177 | if (IS_IA32_PROCESS(task_pt_regs(tsk))) | ||
2178 | return &user_ia32_view; | ||
2179 | #endif | ||
2180 | return &user_ia64_view; | 2170 | return &user_ia64_view; |
2181 | } | 2171 | } |
2182 | 2172 | ||