diff for duplicates of <536C8C90.2050601@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index f871dfa..6406f82 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ >>> >>> ... >>> ->>>> +#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 c33bd57..bdbb97f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,14 +5,13 @@ "ref\020140508061658.GA2384@in.ibm.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Fri, 09 May 2014 08:06:40 +0000\0" + "Date\0Fri, 09 May 2014 17:06:40 +0900\0" "To\0ananth@in.ibm.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 @@ -26,12 +25,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" @@ -42,7 +41,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" @@ -93,4 +92,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -d92038f723e868a7bb4a98dbd1888e811056fe9aae6b9dc2be1c2f35a28a4bd3 +f07c815879a67aabc1c12049760e7777ed6e7f8dd9f9e6a323c4c31e6d4aa2eb
diff --git a/a/1.txt b/N2/1.txt index f871dfa..6406f82 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,7 +5,7 @@ >>> >>> ... >>> ->>>> +#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 c33bd57..b9d3fee 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\020140508061658.GA2384@in.ibm.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Fri, 09 May 2014 08:06:40 +0000\0" + "Date\0Fri, 09 May 2014 17:06:40 +0900\0" "To\0ananth@in.ibm.com\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> @@ -42,7 +42,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" @@ -93,4 +93,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -d92038f723e868a7bb4a98dbd1888e811056fe9aae6b9dc2be1c2f35a28a4bd3 +1b9b1603174969288ec02f29baf286c995a268b4106c1a8409c8d4f4cfc9a169
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.