diff options
| author | David Howells | 2012-10-16 00:10:13 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-16 18:49:15 -0700 |
| commit | 819e1c53ac6410f0ffbc2ee36b7de96988cdcf32 (patch) | |
| tree | 6c4d52c2bb34e6f702bc9acd8bb5aa4822412da1 /arch/frv | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
FRV: Fix VLIW packing constraint violation in entry.S
Fix VLIW packing constraint violation in entry.S:
arch/frv/kernel/entry.S: Assembler messages:
arch/frv/kernel/entry.S:871: Error: VLIW packing constraint violation
When packing CALLL with OR, CALLL must go in the first slot. The
instructions are executed simultaneously, so it doesn't matter which way
round they're packed from that point of view.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv')
| -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 |