Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751677AbaAMLMB (ORCPT ); Mon, 13 Jan 2014 06:12:01 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:36978 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbaAMLL4 (ORCPT ); Mon, 13 Jan 2014 06:11:56 -0500 Date: Mon, 13 Jan 2014 11:11:13 +0000 From: Will Deacon To: Neil Zhang Cc: Catalin Marinas , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Marc Zyngier Subject: Re: [PATCH] arm64: fix typo in entry.S Message-ID: <20140113111112.GC1189@mudshark.cambridge.arm.com> References: <1389603476-10494-1-git-send-email-zhangwm@marvell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1389603476-10494-1-git-send-email-zhangwm@marvell.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 13, 2014 at 08:57:56AM +0000, Neil Zhang wrote: > Commit 64681787 (arm64: let the core code deal with preempt_count) > changed the code, but left the comments unchanged, fix it. > > Signed-off-by: Neil Zhang > --- > arch/arm64/kernel/entry.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 4d2c6f3..ffce55e 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -314,7 +314,7 @@ el1_irq: > > #ifdef CONFIG_PREEMPT > get_thread_info tsk > - ldr w24, [tsk, #TI_PREEMPT] // restore preempt count > + ldr w24, [tsk, #TI_PREEMPT] // get preempt count > cbnz w24, 1f // preempt count != 0 > ldr x0, [tsk, #TI_FLAGS] // get flags > tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? Makes sense: Acked-by: Will Deacon Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/