diff for duplicates of <20140508044753.GA13413@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 9f00f8f..9dbc8a6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Wed, May 07, 2014 at 08:55:51PM +0900, Masami Hiramatsu wrote: ... -> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1) +> +#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 diff --git a/a/content_digest b/N1/content_digest index 93e6d1b..9b8ea8b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,13 @@ "ref\020140507115551.22259.70581.stgit@ltc230.yrl.intra.hitachi.co.jp\0" "From\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Thu, 08 May 2014 04:59:53 +0000\0" + "Date\0Thu, 8 May 2014 10:17:53 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - Paul Mackerras <paulus@samba.org> - Tony Luck <tony.luck@gmail.com> - Jeremy Fitzhardinge <jeremy@goop.org> + "Cc\0Jeremy Fitzhardinge <jeremy@goop.org>" linux-ia64@vger.kernel.org sparse@chrisli.org + Linux Kernel Mailing List <linux-kernel@vger.kernel.org> + Paul Mackerras <paulus@samba.org> H. Peter Anvin <hpa@zytor.com> Thomas Gleixner <tglx@linutronix.de> linux-tip-commits@vger.kernel.org @@ -23,12 +22,12 @@ akataria@vmware.com Tony Luck <tony.luck@intel.com> Kevin Hao <haokexin@gmail.com> - linuxppc-dev@lists.ozlabs.org + Linus Torvalds <torvalds@linux-foundation.org> rdunlap@infradead.org - Linux Kernel Mailing List <linux-kernel@vger.kernel.org> + Tony Luck <tony.luck@gmail.com> dl9pf@gmx.de Andrew Morton <akpm@linux-foundation.org> - Linus Torvalds <torvalds@linux-foundation.org> + linuxppc-dev@lists.ozlabs.org " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" @@ -36,7 +35,7 @@ "\n" "...\n" "\n" - "> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)\n" + "> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)\n" "> +/*\n" "> + * On PPC64 ABIv1 the function pointer actually points to the\n" "> + * function's descriptor. The first entry in the descriptor is the\n" @@ -55,4 +54,4 @@ "\n" Ananth -33ce9cb54e9ab5af8c1e6f541ae9ce7500a70d3809e9cc80279f61bb8bdd10c9 +b7d5d4bda304f28df3bada5373a340b2aa3994bb800fb1313952e6a16aecf4a7
diff --git a/a/1.txt b/N2/1.txt index 9f00f8f..9dbc8a6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On Wed, May 07, 2014 at 08:55:51PM +0900, Masami Hiramatsu wrote: ... -> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1) +> +#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 diff --git a/a/content_digest b/N2/content_digest index 93e6d1b..606faa6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020140507115551.22259.70581.stgit@ltc230.yrl.intra.hitachi.co.jp\0" "From\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Thu, 08 May 2014 04:59:53 +0000\0" + "Date\0Thu, 8 May 2014 10:17:53 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> @@ -36,7 +36,7 @@ "\n" "...\n" "\n" - "> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)\n" + "> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)\n" "> +/*\n" "> + * On PPC64 ABIv1 the function pointer actually points to the\n" "> + * function's descriptor. The first entry in the descriptor is the\n" @@ -55,4 +55,4 @@ "\n" Ananth -33ce9cb54e9ab5af8c1e6f541ae9ce7500a70d3809e9cc80279f61bb8bdd10c9 +6ea32892b459819d013eedbfc58eab1e0006977aec6778b3920fd318977dbaf7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.