1 files changed, 13 insertions, 15 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index f2031314cb2b..0b1d5dd7a93b 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -81,16 +81,6 @@ void cpu_idle(void)
 
 void machine_restart(char * __unused)
 {
-
-#ifdef CONFIG_KEXEC
-        struct kimage *image;
-        image = xchg(&kexec_image, 0);
-        if (image) {
-                machine_shutdown();
-                machine_kexec(image);
-        }
-#endif
-
         /* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
         asm volatile("ldc %0, sr\n\t"
                      "mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001));
@@ -263,6 +253,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
+        struct thread_info *ti = task_thread_info(p);
         struct pt_regs *childregs;
 #if defined(CONFIG_SH_FPU)
         struct task_struct *tsk = current;
@@ -277,8 +268,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
         if (user_mode(regs)) {
                 childregs->regs[15] = usp;
+                ti->addr_limit = USER_DS;
         } else {
                 childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;
+                ti->addr_limit = KERNEL_DS;
         }
         if (clone_flags & CLONE_SETTLS) {
                 childregs->gbr = childregs->regs[0];
@@ -299,13 +292,15 @@ ubc_set_tracing(int asid, unsigned long pc)
 {
         ctrl_outl(pc, UBC_BARA);
 
+#ifdef CONFIG_MMU
         /* We don't have any ASID settings for the SH-2! */
         if (cpu_data->type != CPU_SH7604)
                 ctrl_outb(asid, UBC_BASRA);
+#endif
 
         ctrl_outl(0, UBC_BAMRA);
 
-        if (cpu_data->type == CPU_SH7729) {
+        if (cpu_data->type == CPU_SH7729 || cpu_data->type == CPU_SH7710) {
                 ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
                 ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR);
         } else {
@@ -344,6 +339,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
         }
 #endif
 
+#ifdef CONFIG_MMU
         /*
          * Restore the kernel mode register
          *      k7 (r7_bank1)
@@ -351,19 +347,21 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
         asm volatile("ldc       %0, r7_bank"
                      : /* no output */
                      : "r" (task_thread_info(next)));
+#endif
 
-#ifdef CONFIG_MMU
         /* If no tasks are using the UBC, we're done */
         if (ubc_usercnt == 0)
                 /* If no tasks are using the UBC, we're done */;
         else if (next->thread.ubc_pc && next->mm) {
-                ubc_set_tracing(next->mm->context & MMU_CONTEXT_ASID_MASK,
-                                next->thread.ubc_pc);
+                int asid = 0;
+#ifdef CONFIG_MMU
+                asid |= next->mm->context.id & MMU_CONTEXT_ASID_MASK;
+#endif
+                ubc_set_tracing(asid, next->thread.ubc_pc);
         } else {
                 ctrl_outw(0, UBC_BBRA);
                 ctrl_outw(0, UBC_BBRB);
         }
-#endif
 
         return prev;
 }