FRV: Fix VLIW packing constraint violation in entry.S [ver #2]

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>
cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 002732960315ee429d3cce6a95c8a0440064c64d..ee0beb354e4df38e0c067410e8f9643deec2856f 100644 (file)
--- 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