From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <54E5F3EE.6050406@siemens.com> Date: Thu, 19 Feb 2015 15:32:14 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <20150218181334.GE30317@hermes.click-hack.org> <54E4D835.1040204@siemens.com> <20150218182632.GG30317@hermes.click-hack.org> <54E4DDEA.3060909@siemens.com> <20150218184943.GH30317@hermes.click-hack.org> <54E4E166.5030701@siemens.com> <20150218190549.GI30317@hermes.click-hack.org> <54E4E546.8080801@siemens.com> <20150218192712.GJ30317@hermes.click-hack.org> <54E4FAF4.7050004@siemens.com> <20150218210012.GP30317@hermes.click-hack.org> <54E503FD.6030804@siemens.com> In-Reply-To: <54E503FD.6030804@siemens.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: [Xenomai] [PATCH] arm/ipipe: Fix logical inversion in ret_from_exception List-Id: Discussions about the Xenomai project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gilles Chanteperdrix Cc: Xenomai On return from exception, we want to check if the current context is root or head to take the fast exit in the latter case. TIP_HEAD is set then, thus we have to check for 'ne' (Z==0) after tst. This affects only non-legacy users. Signed-off-by: Jan Kiszka --- This is for 3.14, but it should equally well apply to 3.16. Fixes both sigdebug test as well as the weird sshd deaths on the virtual vexpress target. arch/arm/kernel/entry-armv.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index a608340..f6ef839 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -736,8 +736,8 @@ ENTRY(ret_from_exception) get_thread_info tsk ldr r0, [tsk, #TI_IPIPE] tst r0, #_TIP_HEAD - THUMB( it eq) - beq __ipipe_ret_to_user_irqs_disabled @ Fast exit path over non-root domains + THUMB( it ne) + bne __ipipe_ret_to_user_irqs_disabled @ Fast exit path over non-root domains #endif /* !CONFIG_IPIPE_LEGACY */ #else /* !CONFIG_IPIPE */ get_thread_info tsk -- 2.1.4