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

12 files changed, 28 insertions, 335 deletions

diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index e1236349c99f..4138282aefa8 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -8,15 +8,13 @@ endif
 
 extra-y := head.o init_task.o vmlinux.lds
 
-obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o       \
+obj-y := entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o      \
          irq_lsapic.o ivt.o machvec.o pal.o paravirt_patchlist.o patch.o process.o perfmon.o ptrace.o sal.o             \
          salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \
          unwind.o mca.o mca_asm.o topology.o dma-mapping.o
 
+obj-$(CONFIG_ACPI)              += acpi.o acpi-ext.o
 obj-$(CONFIG_IA64_BRL_EMU)      += brl_emu.o
-obj-$(CONFIG_IA64_GENERIC)      += acpi-ext.o
-obj-$(CONFIG_IA64_HP_ZX1)       += acpi-ext.o
-obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
 
 obj-$(CONFIG_IA64_PALINFO)      += palinfo.o
 obj-$(CONFIG_IOSAPIC)           += iosapic.o
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 40574ae11401..c16fb03037d4 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -60,11 +60,6 @@
 
 #define PREFIX                  "ACPI: "
 
-void (*pm_idle) (void);
-EXPORT_SYMBOL(pm_idle);
-void (*pm_power_off) (void);
-EXPORT_SYMBOL(pm_power_off);
-
 u32 acpi_rsdt_forced;
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
@@ -83,12 +78,10 @@ static unsigned long __init acpi_find_rsdp(void)
                        "v1.0/r0.71 tables no longer supported\n");
         return rsdp_phys;
 }
-#endif
 
 const char __init *
 acpi_get_sysname(void)
 {
-#ifdef CONFIG_IA64_GENERIC
         unsigned long rsdp_phys;
         struct acpi_table_rsdp *rsdp;
         struct acpi_table_xsdt *xsdt;
@@ -143,30 +136,8 @@ acpi_get_sysname(void)
 #endif
 
         return "dig";
-#else
-# if defined (CONFIG_IA64_HP_SIM)
-        return "hpsim";
-# elif defined (CONFIG_IA64_HP_ZX1)
-        return "hpzx1";
-# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB)
-        return "hpzx1_swiotlb";
-# elif defined (CONFIG_IA64_SGI_SN2)
-        return "sn2";
-# elif defined (CONFIG_IA64_SGI_UV)
-        return "uv";
-# elif defined (CONFIG_IA64_DIG)
-        return "dig";
-# elif defined (CONFIG_IA64_XEN_GUEST)
-        return "xen";
-# elif defined(CONFIG_IA64_DIG_VTD)
-        return "dig_vtd";
-# else
-#       error Unknown platform.  Fix acpi.c.
-# endif
-#endif
 }
-
-#ifdef CONFIG_ACPI
+#endif /* CONFIG_IA64_GENERIC */
 
 #define ACPI_MAX_PLATFORM_INTERRUPTS    256
 
@@ -1060,5 +1031,3 @@ void acpi_restore_state_mem(void) {}
  * do_suspend_lowlevel()
  */
 void do_suspend_lowlevel(void) {}
-
-#endif                          /* CONFIG_ACPI */
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index f3802ae89b10..96a9d18ff4c4 100644
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -30,20 +30,11 @@ static unsigned signal_class[] = {
 
 int audit_classify_arch(int arch)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (arch == AUDIT_ARCH_I386)
-                return 1;
-#endif
         return 0;
 }
 
 int audit_classify_syscall(int abi, unsigned syscall)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        extern int ia32_classify_syscall(unsigned);
-        if (abi == AUDIT_ARCH_I386)
-                return ia32_classify_syscall(syscall);
-#endif
         switch(syscall) {
         case __NR_open:
                 return 2;
@@ -58,18 +49,6 @@ int audit_classify_syscall(int abi, unsigned syscall)
 
 static int __init audit_classes_init(void)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        extern __u32 ia32_dir_class[];
-        extern __u32 ia32_write_class[];
-        extern __u32 ia32_read_class[];
-        extern __u32 ia32_chattr_class[];
-        extern __u32 ia32_signal_class[];
-        audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
-        audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
-        audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
-        audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
-        audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_class);
-#endif
         audit_register_class(AUDIT_CLASS_WRITE, write_class);
         audit_register_class(AUDIT_CLASS_READ, read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index d75b872ca4dc..9a260b317d8d 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -71,15 +71,6 @@ ENTRY(ia64_execve)
         add out3=16,sp                  // regs
         br.call.sptk.many rp=sys_execve
 .ret0:
-#ifdef CONFIG_IA32_SUPPORT
-        /*
-         * Check if we're returning to ia32 mode. If so, we need to restore ia32 registers
-         * from pt_regs.
-         */
-        adds r16=PT(CR_IPSR)+16,sp
-        ;;
-        ld8 r16=[r16]
-#endif
         cmp4.ge p6,p7=r8,r0
         mov ar.pfs=loc1                 // restore ar.pfs
         sxt4 r8=r8                      // return 64-bit result
@@ -108,12 +99,6 @@ ENTRY(ia64_execve)
         ldf.fill f23=[sp];      ldf.fill f24=[sp];      mov f25=f0
         ldf.fill f26=[sp];      ldf.fill f27=[sp];      mov f28=f0
         ldf.fill f29=[sp];      ldf.fill f30=[sp];      mov f31=f0
-#ifdef CONFIG_IA32_SUPPORT
-        tbit.nz p6,p0=r16, IA64_PSR_IS_BIT
-        movl loc0=ia64_ret_from_ia32_execve
-        ;;
-(p6)    mov rp=loc0
-#endif
         br.ret.sptk.many rp
 END(ia64_execve)
 
@@ -848,30 +833,6 @@ __paravirt_work_processed_syscall:
         br.cond.sptk.many rbs_switch    // B
 END(__paravirt_leave_syscall)
 
-#ifdef __IA64_ASM_PARAVIRTUALIZED_NATIVE
-#ifdef CONFIG_IA32_SUPPORT
-GLOBAL_ENTRY(ia64_ret_from_ia32_execve)
-        PT_REGS_UNWIND_INFO(0)
-        adds r2=PT(R8)+16,sp                    // r2 = &pt_regs.r8
-        adds r3=PT(R10)+16,sp                   // r3 = &pt_regs.r10
-        ;;
-        .mem.offset 0,0
-        st8.spill [r2]=r8       // store return value in slot for r8 and set unat bit
-        .mem.offset 8,0
-        st8.spill [r3]=r0       // clear error indication in slot for r10 and set unat bit
-#ifdef CONFIG_PARAVIRT
-        ;;
-        // don't fall through, ia64_leave_kernel may be #define'd
-        br.cond.sptk.few ia64_leave_kernel
-        ;;
-#endif /* CONFIG_PARAVIRT */
-END(ia64_ret_from_ia32_execve)
-#ifndef CONFIG_PARAVIRT
-        // fall through
-#endif
-#endif /* CONFIG_IA32_SUPPORT */
-#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
-
 GLOBAL_ENTRY(__paravirt_leave_kernel)
         PT_REGS_UNWIND_INFO(0)
         /*
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index ec9a5fdfa1b9..179fd122e837 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -49,7 +49,6 @@
 
 #include <asm/asmmacro.h>
 #include <asm/break.h>
-#include <asm/ia32.h>
 #include <asm/kregs.h>
 #include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
@@ -1386,28 +1385,6 @@ END(ia32_exception)
 // 0x6a00 Entry 46 (size 16 bundles) IA-32 Intercept  (30,31,59,70,71)
 ENTRY(ia32_intercept)
         DBG_FAULT(46)
-#ifdef  CONFIG_IA32_SUPPORT
-        mov r31=pr
-        MOV_FROM_ISR(r16)
-        ;;
-        extr.u r17=r16,16,8     // get ISR.code
-        mov r18=ar.eflag
-        MOV_FROM_IIM(r19)       // old eflag value
-        ;;
-        cmp.ne p6,p0=2,r17
-(p6)    br.cond.spnt 1f         // not a system flag fault
-        xor r16=r18,r19
-        ;;
-        extr.u r17=r16,18,1     // get the eflags.ac bit
-        ;;
-        cmp.eq p6,p0=0,r17
-(p6)    br.cond.spnt 1f         // eflags.ac bit didn't change
-        ;;
-        mov pr=r31,-1           // restore predicate registers
-        RFI
-
-1:
-#endif  // CONFIG_IA32_SUPPORT
         FAULT(46)
 END(ia32_intercept)
 
@@ -1416,12 +1393,7 @@ END(ia32_intercept)
 // 0x6b00 Entry 47 (size 16 bundles) IA-32 Interrupt  (74)
 ENTRY(ia32_interrupt)
         DBG_FAULT(47)
-#ifdef CONFIG_IA32_SUPPORT
-        mov r31=pr
-        br.sptk.many dispatch_to_ia32_handler
-#else
         FAULT(47)
-#endif
 END(ia32_interrupt)
 
         .org ia64_ivt+0x6c00
@@ -1715,89 +1687,3 @@ ENTRY(dispatch_illegal_op_fault)
 (p6)    br.call.dpnt.many b6=b6         // call returns to ia64_leave_kernel
         br.sptk.many ia64_leave_kernel
 END(dispatch_illegal_op_fault)
-
-#ifdef CONFIG_IA32_SUPPORT
-
-        /*
-         * There is no particular reason for this code to be here, other than that
-         * there happens to be space here that would go unused otherwise.  If this
-         * fault ever gets "unreserved", simply moved the following code to a more
-         * suitable spot...
-         */
-
-        // IA32 interrupt entry point
-
-ENTRY(dispatch_to_ia32_handler)
-        SAVE_MIN
-        ;;
-        MOV_FROM_ISR(r14)
-        SSM_PSR_IC_AND_DEFAULT_BITS_AND_SRLZ_I(r3, r24)
-                                // guarantee that interruption collection is on
-        ;;
-        SSM_PSR_I(p15, p15, r3)
-        adds r3=8,r2            // Base pointer for SAVE_REST
-        ;;
-        SAVE_REST
-        ;;
-        mov r15=0x80
-        shr r14=r14,16          // Get interrupt number
-        ;;
-        cmp.ne p6,p0=r14,r15
-(p6)    br.call.dpnt.many b6=non_ia32_syscall
-
-        adds r14=IA64_PT_REGS_R8_OFFSET + 16,sp // 16 byte hole per SW conventions
-        adds r15=IA64_PT_REGS_R1_OFFSET + 16,sp
-        ;;
-        cmp.eq pSys,pNonSys=r0,r0 // set pSys=1, pNonSys=0
-        ld8 r8=[r14]            // get r8
-        ;;
-        st8 [r15]=r8            // save original EAX in r1 (IA32 procs don't use the GP)
-        ;;
-        alloc r15=ar.pfs,0,0,6,0        // must first in an insn group
-        ;;
-        ld4 r8=[r14],8          // r8 == eax (syscall number)
-        mov r15=IA32_NR_syscalls
-        ;;
-        cmp.ltu.unc p6,p7=r8,r15
-        ld4 out1=[r14],8        // r9 == ecx
-        ;;
-        ld4 out2=[r14],8        // r10 == edx
-        ;;
-        ld4 out0=[r14]          // r11 == ebx
-        adds r14=(IA64_PT_REGS_R13_OFFSET) + 16,sp
-        ;;
-        ld4 out5=[r14],PT(R14)-PT(R13)  // r13 == ebp
-        ;;
-        ld4 out3=[r14],PT(R15)-PT(R14)  // r14 == esi
-        adds r2=TI_FLAGS+IA64_TASK_SIZE,r13
-        ;;
-        ld4 out4=[r14]          // r15 == edi
-        movl r16=ia32_syscall_table
-        ;;
-(p6)    shladd r16=r8,3,r16     // force ni_syscall if not valid syscall number
-        ld4 r2=[r2]             // r2 = current_thread_info()->flags
-        ;;
-        ld8 r16=[r16]
-        and r2=_TIF_SYSCALL_TRACEAUDIT,r2       // mask trace or audit
-        ;;
-        mov b6=r16
-        movl r15=ia32_ret_from_syscall
-        cmp.eq p8,p0=r2,r0
-        ;;
-        mov rp=r15
-(p8)    br.call.sptk.many b6=b6
-        br.cond.sptk ia32_trace_syscall
-
-non_ia32_syscall:
-        alloc r15=ar.pfs,0,0,2,0
-        mov out0=r14                            // interrupt #
-        add out1=16,sp                          // pointer to pt_regs
-        ;;                      // avoid WAW on CFM
-        br.call.sptk.many rp=ia32_bad_interrupt
-.ret1:  movl r15=ia64_leave_kernel
-        ;;
-        mov rp=r15
-        br.ret.sptk.many rp
-END(dispatch_to_ia32_handler)
-
-#endif /* CONFIG_IA32_SUPPORT */
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 6bcbe215b9a4..b81e46b1629b 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2713,7 +2713,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
                         goto buffer_error;
         }
 
-        DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d \n",
+        DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d\n",
                 ctx,
                 ctx_flags,
                 ctx->ctx_fl_system,
@@ -3677,7 +3677,7 @@ pfm_restart(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
          * "self-monitoring".
          */
         if (CTX_OVFL_NOBLOCK(ctx) == 0 && state == PFM_CTX_MASKED) {
-                DPRINT(("unblocking [%d] \n", task_pid_nr(task)));
+                DPRINT(("unblocking [%d]\n", task_pid_nr(task)));
                 complete(&ctx->ctx_restart_done);
         } else {
                 DPRINT(("[%d] armed exit trap\n", task_pid_nr(task)));
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 9bcec9945c12..d92765cae10a 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -33,7 +33,6 @@
 #include <asm/cpu.h>
 #include <asm/delay.h>
 #include <asm/elf.h>
-#include <asm/ia32.h>
 #include <asm/irq.h>
 #include <asm/kexec.h>
 #include <asm/pgalloc.h>
@@ -60,6 +59,10 @@ unsigned long idle_halt;
 EXPORT_SYMBOL(idle_halt);
 unsigned long idle_nomwait;
 EXPORT_SYMBOL(idle_nomwait);
+void (*pm_idle) (void);
+EXPORT_SYMBOL(pm_idle);
+void (*pm_power_off) (void);
+EXPORT_SYMBOL(pm_power_off);
 
 void
 ia64_do_show_stack (struct unw_frame_info *info, void *arg)
@@ -358,11 +361,6 @@ ia64_save_extra (struct task_struct *task)
         if (info & PFM_CPUINFO_SYST_WIDE)
                 pfm_syst_wide_update_task(task, info, 0);
 #endif
-
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(task_pt_regs(task)))
-                ia32_save_state(task);
-#endif
 }
 
 void
@@ -383,11 +381,6 @@ ia64_load_extra (struct task_struct *task)
         if (info & PFM_CPUINFO_SYST_WIDE) 
                 pfm_syst_wide_update_task(task, info, 1);
 #endif
-
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(task_pt_regs(task)))
-                ia32_load_state(task);
-#endif
 }
 
 /*
@@ -426,7 +419,7 @@ copy_thread(unsigned long clone_flags,
              unsigned long user_stack_base, unsigned long user_stack_size,
              struct task_struct *p, struct pt_regs *regs)
 {
-        extern char ia64_ret_from_clone, ia32_ret_from_clone;
+        extern char ia64_ret_from_clone;
         struct switch_stack *child_stack, *stack;
         unsigned long rbs, child_rbs, rbs_size;
         struct pt_regs *child_ptregs;
@@ -457,7 +450,7 @@ copy_thread(unsigned long clone_flags,
         memcpy((void *) child_rbs, (void *) rbs, rbs_size);
 
         if (likely(user_mode(child_ptregs))) {
-                if ((clone_flags & CLONE_SETTLS) && !IS_IA32_PROCESS(regs))
+                if (clone_flags & CLONE_SETTLS)
                         child_ptregs->r13 = regs->r16;  /* see sys_clone2() in entry.S */
                 if (user_stack_base) {
                         child_ptregs->r12 = user_stack_base + user_stack_size - 16;
@@ -477,10 +470,7 @@ copy_thread(unsigned long clone_flags,
                 child_ptregs->r13 = (unsigned long) p;          /* set `current' pointer */
         }
         child_stack->ar_bspstore = child_rbs + rbs_size;
-        if (IS_IA32_PROCESS(regs))
-                child_stack->b0 = (unsigned long) &ia32_ret_from_clone;
-        else
-                child_stack->b0 = (unsigned long) &ia64_ret_from_clone;
+        child_stack->b0 = (unsigned long) &ia64_ret_from_clone;
 
         /* copy parts of thread_struct: */
         p->thread.ksp = (unsigned long) child_stack - 16;
@@ -515,22 +505,6 @@ copy_thread(unsigned long clone_flags,
         p->thread.flags = ((current->thread.flags & ~THREAD_FLAGS_TO_CLEAR)
                            | THREAD_FLAGS_TO_SET);
         ia64_drop_fpu(p);       /* don't pick up stale state from a CPU's fph */
-#ifdef CONFIG_IA32_SUPPORT
-        /*
-         * If we're cloning an IA32 task then save the IA32 extra
-         * state from the current task to the new task
-         */
-        if (IS_IA32_PROCESS(task_pt_regs(current))) {
-                ia32_save_state(p);
-                if (clone_flags & CLONE_SETTLS)
-                        retval = ia32_clone_tls(p, child_ptregs);
-
-                /* Copy partially mapped page list */
-                if (!retval)
-                        retval = ia32_copy_ia64_partial_page_list(p,
-                                                                clone_flags);
-        }
-#endif
 
 #ifdef CONFIG_PERFMON
         if (current->thread.pfm_context)
@@ -704,15 +678,6 @@ EXPORT_SYMBOL(kernel_thread);
 int
 kernel_thread_helper (int (*fn)(void *), void *arg)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(task_pt_regs(current))) {
-                /* A kernel thread is always a 64-bit process. */
-                current->thread.map_base  = DEFAULT_MAP_BASE;
-                current->thread.task_size = DEFAULT_TASK_SIZE;
-                ia64_set_kr(IA64_KR_IO_BASE, current->thread.old_iob);
-                ia64_set_kr(IA64_KR_TSSD, current->thread.old_k1);
-        }
-#endif
         return (*fn)(arg);
 }
 
@@ -725,14 +690,6 @@ flush_thread (void)
         /* drop floating-point and debug-register state if it exists: */
         current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
         ia64_drop_fpu(current);
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(task_pt_regs(current))) {
-                ia32_drop_ia64_partial_page_list(current);
-                current->thread.task_size = IA32_PAGE_OFFSET;
-                set_fs(USER_DS);
-                memset(current->thread.tls_array, 0, sizeof(current->thread.tls_array));
-        }
-#endif
 }
 
 /*
@@ -753,8 +710,6 @@ exit_thread (void)
         if (current->thread.flags & IA64_THREAD_DBG_VALID)
                 pfm_release_debug_registers(current);
 #endif
-        if (IS_IA32_PROCESS(task_pt_regs(current)))
-                ia32_drop_ia64_partial_page_list(current);
 }
 
 unsigned long
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;
 }
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index a1ea87919777..41ae6a596b50 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -46,7 +46,6 @@
 #include <linux/kexec.h>
 #include <linux/crash_dump.h>
 
-#include <asm/ia32.h>
 #include <asm/machvec.h>
 #include <asm/mca.h>
 #include <asm/meminit.h>
@@ -1016,10 +1015,6 @@ cpu_init (void)
         ia64_mmu_init(ia64_imva(cpu_data));
         ia64_mca_cpu_init(ia64_imva(cpu_data));
 
-#ifdef CONFIG_IA32_SUPPORT
-        ia32_cpu_init();
-#endif
-
         /* Clear ITC to eliminate sched_clock() overflows in human time.  */
         ia64_set_itc(0);
 
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index e1821ca4c7df..7bdafc8788bd 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -21,7 +21,6 @@
 #include <linux/unistd.h>
 #include <linux/wait.h>
 
-#include <asm/ia32.h>
 #include <asm/intrinsics.h>
 #include <asm/uaccess.h>
 #include <asm/rse.h>
@@ -425,14 +424,8 @@ static long
 handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset,
                struct sigscratch *scr)
 {
-        if (IS_IA32_PROCESS(&scr->pt)) {
-                /* send signal to IA-32 process */
-                if (!ia32_setup_frame1(sig, ka, info, oldset, &scr->pt))
-                        return 0;
-        } else
-                /* send signal to IA-64 process */
-                if (!setup_frame(sig, ka, info, oldset, scr))
-                        return 0;
+        if (!setup_frame(sig, ka, info, oldset, scr))
+                return 0;
 
         spin_lock_irq(&current->sighand->siglock);
         sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
@@ -462,7 +455,6 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
         siginfo_t info;
         long restart = in_syscall;
         long errno = scr->pt.r8;
-#       define ERR_CODE(c)      (IS_IA32_PROCESS(&scr->pt) ? -(c) : (c))
 
         /*
          * In the ia64_leave_kernel code path, we want the common case to go fast, which
@@ -490,14 +482,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                  * inferior call), thus it's important to check for restarting _after_
                  * get_signal_to_deliver().
                  */
-                if (IS_IA32_PROCESS(&scr->pt)) {
-                        if (in_syscall) {
-                                if (errno >= 0)
-                                        restart = 0;
-                                else
-                                        errno = -errno;
-                        }
-                } else if ((long) scr->pt.r10 != -1)
+                if ((long) scr->pt.r10 != -1)
                         /*
                          * A system calls has to be restarted only if one of the error codes
                          * ERESTARTNOHAND, ERESTARTSYS, or ERESTARTNOINTR is returned.  If r10
@@ -513,22 +498,18 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                         switch (errno) {
                               case ERESTART_RESTARTBLOCK:
                               case ERESTARTNOHAND:
-                                scr->pt.r8 = ERR_CODE(EINTR);
+                                scr->pt.r8 = EINTR;
                                 /* note: scr->pt.r10 is already -1 */
                                 break;
 
                               case ERESTARTSYS:
                                 if ((ka.sa.sa_flags & SA_RESTART) == 0) {
-                                        scr->pt.r8 = ERR_CODE(EINTR);
+                                        scr->pt.r8 = EINTR;
                                         /* note: scr->pt.r10 is already -1 */
                                         break;
                                 }
                               case ERESTARTNOINTR:
-                                if (IS_IA32_PROCESS(&scr->pt)) {
-                                        scr->pt.r8 = scr->pt.r1;
-                                        scr->pt.cr_iip -= 2;
-                                } else
-                                        ia64_decrement_ip(&scr->pt);
+                                ia64_decrement_ip(&scr->pt);
                                 restart = 0; /* don't restart twice if handle_signal() fails... */
                         }
                 }
@@ -555,21 +536,14 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                 if (errno == ERESTARTNOHAND || errno == ERESTARTSYS || errno == ERESTARTNOINTR
                     || errno == ERESTART_RESTARTBLOCK)
                 {
-                        if (IS_IA32_PROCESS(&scr->pt)) {
-                                scr->pt.r8 = scr->pt.r1;
-                                scr->pt.cr_iip -= 2;
-                                if (errno == ERESTART_RESTARTBLOCK)
-                                        scr->pt.r8 = 0; /* x86 version of __NR_restart_syscall */
-                        } else {
-                                /*
-                                 * Note: the syscall number is in r15 which is saved in
-                                 * pt_regs so all we need to do here is adjust ip so that
-                                 * the "break" instruction gets re-executed.
-                                 */
-                                ia64_decrement_ip(&scr->pt);
-                                if (errno == ERESTART_RESTARTBLOCK)
-                                        scr->pt.r15 = __NR_restart_syscall;
-                        }
+                        /*
+                         * Note: the syscall number is in r15 which is saved in
+                         * pt_regs so all we need to do here is adjust ip so that
+                         * the "break" instruction gets re-executed.
+                         */
+                        ia64_decrement_ip(&scr->pt);
+                        if (errno == ERESTART_RESTARTBLOCK)
+                                scr->pt.r15 = __NR_restart_syscall;
                 }
         }
 
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index de100aa7ff03..e5230b2ff2c5 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -44,7 +44,6 @@
 #include <asm/cache.h>
 #include <asm/current.h>
 #include <asm/delay.h>
-#include <asm/ia32.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/machvec.h>
@@ -443,10 +442,6 @@ smp_callin (void)
                 calibrate_delay();
         local_cpu_data->loops_per_jiffy = loops_per_jiffy;
 
-#ifdef CONFIG_IA32_SUPPORT
-        ia32_gdt_init();
-#endif
-
         /*
          * Allow the master to continue.
          */
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index f0cda765e681..fd80e70018a9 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -19,7 +19,6 @@
 #include <linux/kdebug.h>
 
 #include <asm/fpswa.h>
-#include <asm/ia32.h>
 #include <asm/intrinsics.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
@@ -626,10 +625,6 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 break;
 
               case 45:
-#ifdef CONFIG_IA32_SUPPORT
-                if (ia32_exception(&regs, isr) == 0)
-                        return;
-#endif
                 printk(KERN_ERR "Unexpected IA-32 exception (Trap 45)\n");
                 printk(KERN_ERR "  iip - 0x%lx, ifa - 0x%lx, isr - 0x%lx\n",
                        iip, ifa, isr);
@@ -637,10 +632,6 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 break;
 
               case 46:
-#ifdef CONFIG_IA32_SUPPORT
-                if (ia32_intercept(&regs, isr) == 0)
-                        return;
-#endif
                 printk(KERN_ERR "Unexpected IA-32 intercept trap (Trap 46)\n");
                 printk(KERN_ERR "  iip - 0x%lx, ifa - 0x%lx, isr - 0x%lx, iim - 0x%lx\n",
                        iip, ifa, isr, iim);