diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:49:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:49:22 -0700 |
| commit | 90a24a4a7e8f8b3488438276e1d15bb3762df31e (patch) | |
| tree | d669b36e7558fa9caa8d4466c09db928801d7a01 /arch/frv/kernel/process.c | |
| parent | 85eae82a0855d49852b87deac8653e4ebc8b291f (diff) | |
| parent | 0c552e5fb9bec3d4942663a2a90e04a685fd8482 (diff) | |
Merge branch 'frv' (FRV patches from David Howells)
Merge emailed FRV fixes from David Howells.
* frv:
FRV: Fix linux/elf-fdpic.h
FRV: Fix const sections change
FRV: Fix incorrect symbol in copy_thread()
FRV: Fix VLIW packing constraint violation in entry.S
Diffstat (limited to 'arch/frv/kernel/process.c')
| -rw-r--r-- | arch/frv/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 655d90d20bb0..e1e3aa196aa4 100644 --- a/arch/frv/kernel/process.c +++ b/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; |