From: David Howells Date: Mon, 15 Oct 2012 23:10:13 +0000 (+0100) Subject: FRV: Fix VLIW packing constraint violation in entry.S X-Git-Tag: v3.7-rc2~36^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=819e1c53ac6410f0ffbc2ee36b7de96988cdcf32;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Acked-by: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 0027329..ee0beb3 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