From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A9D8C433E1 for ; Thu, 30 Jul 2020 08:17:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E9842074B for ; Thu, 30 Jul 2020 08:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596097079; bh=iej6e75OdJ4FjTF9iBgRgxT703Ivd4BvmX4A/d57jHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EXwSZUSQca/4eE2Gi0k3GSFy/TaVVK2YwVBQXzAtZmsHz4Fp7qIa0GLeXJgfqMNvB LVIywJ5bKhWPKCE95DMNkz8aijwvnB24MTyBbypXlwJH3HYTkNQPjL/EUWTq2iDA5C FDwLUB4kzH0CG2uLuWNfo1a9ZN5d0Lb7JvhTI/bY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729774AbgG3IR5 (ORCPT ); Thu, 30 Jul 2020 04:17:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:47470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729661AbgG3IJB (ORCPT ); Thu, 30 Jul 2020 04:09:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0381C20838; Thu, 30 Jul 2020 08:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596096540; bh=iej6e75OdJ4FjTF9iBgRgxT703Ivd4BvmX4A/d57jHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QzJYzqva4eHv/F/BhXJ8Ms4so1l3qCdByty5boFKAwfa/P7catBUfMPdkKy95vRCL H7MC2CxjNvbv/plwqqAJ4faleXpBCF2NjA9O6GINUhRXlwzsRo/yudGVWNmetDpGhP 6t53pjst/w6E3dMMfdVIZoqZTioK/cxtoZp1jx8A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Will Deacon , Sasha Levin Subject: [PATCH 4.9 27/61] arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP Date: Thu, 30 Jul 2020 10:04:45 +0200 Message-Id: <20200730074422.154706063@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200730074420.811058810@linuxfoundation.org> References: <20200730074420.811058810@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 5afc78551bf5d53279036e0bf63314e35631d79f ] Rather than open-code test_tsk_thread_flag() at each callsite, simply replace the couple of offenders with calls to test_tsk_thread_flag() directly. Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/debug-monitors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index a5236a3e52978..3101d1b61713e 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -380,14 +380,14 @@ void user_rewind_single_step(struct task_struct *task) * If single step is active for this thread, then set SPSR.SS * to 1 to avoid returning to the active-pending state. */ - if (test_ti_thread_flag(task_thread_info(task), TIF_SINGLESTEP)) + if (test_tsk_thread_flag(task, TIF_SINGLESTEP)) set_regs_spsr_ss(task_pt_regs(task)); } NOKPROBE_SYMBOL(user_rewind_single_step); void user_fastforward_single_step(struct task_struct *task) { - if (test_ti_thread_flag(task_thread_info(task), TIF_SINGLESTEP)) + if (test_tsk_thread_flag(task, TIF_SINGLESTEP)) clear_regs_spsr_ss(task_pt_regs(task)); } -- 2.25.1