Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1043283pxv; Fri, 25 Jun 2021 04:16:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywoM8up/To95NC3xZQOYGYiLOenFJr0RHisgmsM9JYAFdWHkq4XeOsGMHxshDAMxZZ2d/N X-Received: by 2002:a17:906:36d5:: with SMTP id b21mr10194330ejc.258.1624619781349; Fri, 25 Jun 2021 04:16:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624619781; cv=none; d=google.com; s=arc-20160816; b=Ad0hqOJZVqQe5eKWZqhxeLLndLQP7jr+uL3kShDvwsRC6z30Mv/CrWLNZ3uJW+U3/1 mAOl++BHSwPxeT0QQWlLu/AUMKO5v037YNkRtqhs/v4vBG0tVn5T294693ZbEnzYeNYd K9OC3/lCybhu6FrBQgK8Cx5QHzzUNaRz71F6WuQPuTmGybOERKwLWqfL2i2OskZMdYrt RHuImYweYltMiEamtVmc9jhC0cZr2nJm9TbmehDaha9iZVPM+0xqZGzgnlnLOaTkfNwR tjM93OWXRRsc+RM5UNRVZrffOnAkkGI2pgzd9i6cXeGTFvPAgQEXCT2JRUfRGLRHn17h PX4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=PRC6U2lMtBo5RLNATpjJ+aDYbeEBf4hVpzQk+wwg0Y4=; b=0OFC3NfRUMgAXCk0L/BcFFDzjaYMiIjzqK6jW9MVGK19aLmBvLdiknLUC+vbRhfGtx B8E4QuJg+9qKTs11xrI/tQ+yCLeaCPW7M+3ck1rf5MAXfEUhRQ6e85zAVaAr6Fc1+ilm ZHIg1L7j2MuAWjZEpxx+irTY1So2iFSkNRS84U8FcGRSFVE9I3jFUfeAKG4S/adYCXc/ bB3Bum81UnVkOjjH8aoPdwBhP4AQu4rA6WZY+bY+VE9Exyvr1RgLpWH7/iR6vCnzGqlJ I9WQUW9b7gWNsh+foT5/CxYNKlHf/zCk3XhUr/ZHZEWMhMX+4MDW8TZD9+/yiM++HGq5 Kd0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j22si5980860eds.190.2021.06.25.04.15.55; Fri, 25 Jun 2021 04:16:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230135AbhFYLPm (ORCPT + 99 others); Fri, 25 Jun 2021 07:15:42 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:38220 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbhFYLPm (ORCPT ); Fri, 25 Jun 2021 07:15:42 -0400 Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4GBDrb3qDbzBBst; Fri, 25 Jun 2021 13:13:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Culj7UlqLg-y; Fri, 25 Jun 2021 13:13:19 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4GBDrZ2z97zBBft; Fri, 25 Jun 2021 13:13:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 52F4F8B7FF; Fri, 25 Jun 2021 13:13:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Er4ktLbhQQd7; Fri, 25 Jun 2021 13:13:18 +0200 (CEST) Received: from po9473vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BA7238B802; Fri, 25 Jun 2021 13:13:17 +0200 (CEST) Received: by po9473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 53D5666377; Fri, 25 Jun 2021 11:13:17 +0000 (UTC) Message-Id: In-Reply-To: <49f4fb051a3e1cb69f7305d5b6768aec14727c32.1624619582.git.christophe.leroy@csgroup.eu> References: <49f4fb051a3e1cb69f7305d5b6768aec14727c32.1624619582.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH 2/2] powerpc/ptrace: Refactor regs_set_return_{msr/ip} To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 25 Jun 2021 11:13:17 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org regs_set_return_msr() and regs_set_return_ip() have a copy of the code of set_return_regs_changed(). Call the later instead. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/ptrace.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index 14b8105a1e27..3e5d470a6155 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -146,19 +146,13 @@ static inline void set_return_regs_changed(void) static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) { regs->nip = ip; -#ifdef CONFIG_PPC_BOOK3S_64 - local_paca->hsrr_valid = 0; - local_paca->srr_valid = 0; -#endif + set_return_regs_changed(); } static inline void regs_set_return_msr(struct pt_regs *regs, unsigned long msr) { regs->msr = msr; -#ifdef CONFIG_PPC_BOOK3S_64 - local_paca->hsrr_valid = 0; - local_paca->srr_valid = 0; -#endif + set_return_regs_changed(); } static inline void regs_add_return_ip(struct pt_regs *regs, long offset) -- 2.25.0