Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934007AbaFRH41 (ORCPT ); Wed, 18 Jun 2014 03:56:27 -0400 Received: from ozlabs.org ([103.22.144.67]:53888 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756388AbaFRH4W (ORCPT ); Wed, 18 Jun 2014 03:56:22 -0400 Message-ID: <1403078179.32307.7.camel@concordia> Subject: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64 From: Michael Ellerman To: Masami Hiramatsu Cc: Benjamin Herrenschmidt , "Suzuki K. Poulose" , Tony Luck , Paul Mackerras , Jeremy Fitzhardinge , linux-ia64@vger.kernel.org, sparse@chrisli.org, "H. Peter Anvin" , Thomas Gleixner , linux-tip-commits@vger.kernel.org, anil.s.keshavamurthy@intel.com, Ingo Molnar , Fenghua Yu , Arnd Bergmann , Rusty Russell , Chris Wright , yrl.pp-manager.tt@hitachi.com, akataria@vmware.com, Tony Luck , Kevin Hao , Linus Torvalds , rdunlap@infradead.org, Linux Kernel Mailing List , dl9pf@gmx.de, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Date: Wed, 18 Jun 2014 17:56:19 +1000 In-Reply-To: <539161D6.7020508@hitachi.com> References: <5387F150.5000307@hitachi.com> <20140530031838.17427.75896.stgit@ltc230.yrl.intra.hitachi.co.jp> <539161D6.7020508@hitachi.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2014-06-06 at 15:38 +0900, Masami Hiramatsu wrote: > Ping? > > I guess this should go to 3.16 branch, shouldn't it? > > diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h > > index bfb6ded..8b89d65 100644 > > --- a/arch/powerpc/include/asm/types.h > > +++ b/arch/powerpc/include/asm/types.h > > @@ -25,6 +25,17 @@ typedef struct { > > unsigned long env; > > } func_descr_t; > > > > +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1) > > +/* > > + * On PPC64 ABIv1 the function pointer actually points to the > > + * function's descriptor. The first entry in the descriptor is the > > + * address of the function text. > > + */ > > +#define function_entry(fn) (((func_descr_t *)(fn))->entry) > > +#else > > +#define function_entry(fn) ((unsigned long)(fn)) > > +#endif We already have ppc_function_entry(), can't you use that? cheers -- 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/