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/entry.S | |
| 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/entry.S')
| -rw-r--r-- | arch/frv/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 002732960315..ee0beb354e4d 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -867,8 +867,8 @@ ret_from_fork: ret_from_kernel_thread: lddi.p @(gr28,#REG_GR(8)),gr20 call schedule_tail - or.p gr20,gr20,gr8 - calll @(gr21,gr0) + calll.p @(gr21,gr0) + or gr20,gr20,gr8 bra sys_exit .globl ret_from_kernel_execve |