diff --git a/[refs] b/[refs] index ed53a046c5df..32bbf83ee511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 819e1c53ac6410f0ffbc2ee36b7de96988cdcf32 +refs/heads/master: ce7bfc7cde0acd46a1d342fd64a0be15ad9e7930 diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c index 655d90d20bb0..e1e3aa196aa4 100644 --- a/trunk/arch/frv/kernel/process.c +++ b/trunk/arch/frv/kernel/process.c @@ -194,7 +194,7 @@ int copy_thread(unsigned long clone_flags, memset(childregs, 0, sizeof(struct pt_regs)); childregs->gr9 = usp; /* function */ childregs->gr8 = arg; - chilregs->psr = PSR_S; + childregs->psr = PSR_S; p->thread.pc = (unsigned long) ret_from_kernel_thread; save_user_regs(p->thread.user); return 0;