Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wrong attribute of HUB chip written in uv_setup()
  [IA64] remove trailing space in messages
  [IA64] use asm-generic/scatterlist.h
  [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
  [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
  [IA64] Remove COMPAT_IA32 support

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,
                 long syscall;
                 int arch;
 
-                if (IS_IA32_PROCESS(&regs)) {
-                        syscall = regs.r1;
-                        arch = AUDIT_ARCH_I386;
-                } else {
-                        syscall = regs.r15;
-                        arch = AUDIT_ARCH_IA64;
-                }
+                syscall = regs.r15;
+                arch = AUDIT_ARCH_IA64;
 
                 audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);
         }
@@ -2172,11 +2167,6 @@ static const struct user_regset_view user_ia64_view = {
 
 const struct user_regset_view *task_user_regset_view(struct task_struct *tsk)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        extern const struct user_regset_view user_ia32_view;
-        if (IS_IA32_PROCESS(task_pt_regs(tsk)))
-                return &user_ia32_view;
-#endif
         return &user_ia64_view;
 }