Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1041436pxv; Fri, 25 Jun 2021 04:14:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtCz8n1G/C5tt4givMEykMJ8balX/GRhEjo9MLuttuYr1WahRHm3fY+UZww4K08ufC9nA6 X-Received: by 2002:a05:6638:d4f:: with SMTP id d15mr9158502jak.32.1624619640262; Fri, 25 Jun 2021 04:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624619640; cv=none; d=google.com; s=arc-20160816; b=PBO50J6QM8OzBP+GsskoIXMTpCiHUEwdPrBEpNxjeHIZBjyJu3gowoynZcfdbhYgwc EawzGsVeC/rMf0MA3SUtTtSUv/PCaXWNjuiue6CwnKq8xpoq4ldQg4CFigUw/9Gb9Szg UDTF21tJMM4SlLKmLVJjXqQC1XMkp90m/sLRG3hkJ/8+1gibGCvFdKiyDlTgFy06jn4t cZzkk6A9eIzksdFHC0A/vZExsxHEkKUBjENQ3fbbAc67fKx75iQA3QS5/O7wsidwPeKo Bk2hZ4MxsA8zEddD55dd0huSl4fCqMyLD+PGxM2joMgyseDYpQnj8x6PPw3TE41lZFoy CrQA== 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:message-id; bh=ZlsPGmEI3Tu3HvaWnv1YHkkLQIN4jqJoF9vLSnAY0PE=; b=O42j35VQSqOIZTGq97rE0HZjIDfXn9GU8TI6d0FMbvoV7LpqewDa9R7Ug1nnI0tEwJ jkg/eNmPZAQN2VdYZ+teBxFT+cz3oRTHNU/aAdLDZiq2EHWY4D8GcE3V+OyPuhIJjwET ZFyKeowHLwpfpR4DLXal66i/odzW6gJQ0sXq7UOsXwx+xTC+9mPJRvPUmLTP/TmyYxV1 zZwhmGVacKML23pRzfpGU8us0iCMQzUVaUliUezwGsmhTUENCG6aJcBibQAWkA2A3p+P V0LgVld2aOo/SBHyEurS/U7xsFPECGIOWEpzn77eBrSXqc/FeI+z50ZcgTSE0NrFvslL MiWQ== 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 g2si7549686ioo.75.2021.06.25.04.13.47; Fri, 25 Jun 2021 04:14:00 -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 S229671AbhFYLPk (ORCPT + 99 others); Fri, 25 Jun 2021 07:15:40 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:5330 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbhFYLPj (ORCPT ); Fri, 25 Jun 2021 07:15:39 -0400 Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4GBDrZ1xnvzBBh0; Fri, 25 Jun 2021 13:13:18 +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 qizscpcGZpPC; Fri, 25 Jun 2021 13:13:18 +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 4GBDrY124DzBBft; Fri, 25 Jun 2021 13:13:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0C3AB8B802; Fri, 25 Jun 2021 13:13:17 +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 qjDWOupUbZba; Fri, 25 Jun 2021 13:13:16 +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 B9B3D8B7FF; Fri, 25 Jun 2021 13:13:16 +0200 (CEST) Received: by po9473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 49CB566377; Fri, 25 Jun 2021 11:13:16 +0000 (UTC) Message-Id: <49f4fb051a3e1cb69f7305d5b6768aec14727c32.1624619582.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH 1/2] powerpc/ptrace: Move set_return_regs_changed() before 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:16 +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(). Move up set_return_regs_changed() so it can be reused by regs_set_return_{msr/ip} Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/ptrace.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index fcf63f559344..14b8105a1e27 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -135,26 +135,26 @@ extern unsigned long profile_pc(struct pt_regs *regs); long do_syscall_trace_enter(struct pt_regs *regs); void do_syscall_trace_leave(struct pt_regs *regs); -static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) +static inline void set_return_regs_changed(void) { - regs->nip = ip; #ifdef CONFIG_PPC_BOOK3S_64 local_paca->hsrr_valid = 0; local_paca->srr_valid = 0; #endif } -static inline void regs_set_return_msr(struct pt_regs *regs, unsigned long msr) +static inline void regs_set_return_ip(struct pt_regs *regs, unsigned long ip) { - regs->msr = msr; + regs->nip = ip; #ifdef CONFIG_PPC_BOOK3S_64 local_paca->hsrr_valid = 0; local_paca->srr_valid = 0; #endif } -static inline void set_return_regs_changed(void) +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; -- 2.25.0