From 190bb15b19d916c662dc1046ff0bd760365aa396 Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 16 Oct 2012 00:10:21 +0100 Subject: [PATCH] --- yaml --- r: 334415 b: refs/heads/master c: ce7bfc7cde0acd46a1d342fd64a0be15ad9e7930 h: refs/heads/master i: 334413: f64828c2a1a71cdd905f0f0f332bc8c4b93caed0 334411: f73d72d73d65b97573bdcd43d5483d0413714835 334407: 79983a57dd893fc697f48cba987e0d71dd62a5ab 334399: 81eba23f403b2e45b4de3b675c948225bf07797d v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;