From: Michael Ellerman Subject: Re: [PATCH 2/5] powerpc: don't use asm-generic/ptrace.h Date: Thu, 02 May 2019 13:30:26 +1000 Message-ID: <87ftpxa5yl.fsf@concordia.ellerman.id.au> References: <20190501173943.5688-1-hch@lst.de> <20190501173943.5688-3-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20190501173943.5688-3-hch@lst.de> Sender: linux-kernel-owner@vger.kernel.org To: Christoph Hellwig , Oleg Nesterov , Arnd Bergmann Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arch.vger.kernel.org Christoph Hellwig writes: > Doing the indirection through macros for the regs accessors just > makes them harder to read, so implement the helpers directly. > > Note that only the helpers actually used are implemented now. > > Signed-off-by: Christoph Hellwig > --- > arch/powerpc/include/asm/ptrace.h | 29 ++++++++++++++++++++++------- > 1 file changed, 22 insertions(+), 7 deletions(-) Looks fine, thanks. Acked-by: Michael Ellerman cheers > diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h > index 64271e562fed..5d30944f1f6b 100644 > --- a/arch/powerpc/include/asm/ptrace.h > +++ b/arch/powerpc/include/asm/ptrace.h > @@ -108,18 +108,33 @@ struct pt_regs > > #ifndef __ASSEMBLY__ > > -#define GET_IP(regs) ((regs)->nip) > -#define GET_USP(regs) ((regs)->gpr[1]) > -#define GET_FP(regs) (0) > -#define SET_FP(regs, val) > +static inline unsigned long instruction_pointer(struct pt_regs *regs) > +{ > + return regs->nip; > +} > + > +static inline void instruction_pointer_set(struct pt_regs *regs, > + unsigned long val) > +{ > + regs->nip = val; > +} > + > +static inline unsigned long user_stack_pointer(struct pt_regs *regs) > +{ > + return regs->gpr[1]; > +} > + > +static inline unsigned long frame_pointer(struct pt_regs *regs) > +{ > + return 0; > +} > > #ifdef CONFIG_SMP > extern unsigned long profile_pc(struct pt_regs *regs); > -#define profile_pc profile_pc > +#else > +#define profile_pc(regs) instruction_pointer(regs) > #endif > > -#include > - > #define kernel_stack_pointer(regs) ((regs)->gpr[1]) > static inline int is_syscall_success(struct pt_regs *regs) > { > -- > 2.20.1