Skip to content

Commit

Permalink
FRV: Fix VLIW packing constraint violation in entry.S
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Howells authored and Linus Torvalds committed Oct 17, 2012
1 parent ddffeb8 commit 819e1c5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/frv/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 819e1c5

Please sign in to comment.