Merge tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / arch / microblaze / kernel / process.c

diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index f99860771ff4854f13b1c3832edb53f1fd61ac1c..657c2beb665ea27440c9a2b0992f19e350f49708 100644 (file)
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -69,9 +69,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, unsigned long arg,
                ti->cpu_context.r19 = (unsigned long)arg;
                childregs->pt_mode = 1;
                local_save_flags(childregs->msr);
-#ifdef CONFIG_MMU
                ti->cpu_context.msr = childregs->msr & ~MSR_IE;
-#endif
                ti->cpu_context.r15 = (unsigned long)ret_from_kernel_thread - 8;
                return 0;
        }
@@ -81,9 +79,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, unsigned long arg,
 
        memset(&ti->cpu_context, 0, sizeof(struct cpu_context));
        ti->cpu_context.r1 = (unsigned long)childregs;
-#ifndef CONFIG_MMU
-       ti->cpu_context.msr = (unsigned long)childregs->msr;
-#else
        childregs->msr |= MSR_UMS;
 
        /* we should consider the fact that childregs is a copy of the parent
@@ -105,7 +100,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, unsigned long arg,
        ti->cpu_context.msr = (childregs->msr|MSR_VM);
        ti->cpu_context.msr &= ~MSR_UMS; /* switch_to to kernel mode */
        ti->cpu_context.msr &= ~MSR_IE;
-#endif
        ti->cpu_context.r15 = (unsigned long)ret_from_fork - 8;
 
        /*
@@ -130,13 +124,10 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp)
        regs->pc = pc;
        regs->r1 = usp;
        regs->pt_mode = 0;
-#ifdef CONFIG_MMU
        regs->msr |= MSR_UMS;
        regs->msr &= ~MSR_VM;
-#endif
 }
 
-#ifdef CONFIG_MMU
 #include <linux/elfcore.h>
 /*
  * Set up a thread for executing a new program
@@ -145,7 +136,6 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpregs)
 {
        return 0; /* MicroBlaze has no separate FPU registers */
 }
-#endif /* CONFIG_MMU */
 
 void arch_cpu_idle(void)
 {