diff for duplicates of <53A2B136.108@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d819fbb..30ac31e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ On 06/19/2014 12:56 PM, Masami Hiramatsu wrote: >>>>>>>> unsigned long env; >>>>>>>> } func_descr_t; >>>>>>>> ->>>>>>>> +#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 bfe0479..4997053 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,15 +9,13 @@ "ref\053A2908E.2000806@hitachi.com\0" "From\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" "Subject\0Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Thu, 19 Jun 2014 09:57:26 +0000\0" + "Date\0Thu, 19 Jun 2014 15:15:26 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Cc\0Michael Ellerman <mpe@ellerman.id.au>" - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Tony Luck <tony.luck@gmail.com> - Paul Mackerras <paulus@samba.org> - 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 @@ -31,12 +29,12 @@ akataria@vmware.com Tony Luck <tony.luck@intel.com> Kevin Hao <haokexin@gmail.com> - Linus Torvalds <torvalds@linux-foundation.org> + linuxppc-dev@lists.ozlabs.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> - linuxppc-dev@lists.ozlabs.org + Linus Torvalds <torvalds@linux-foundation.org> " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" @@ -59,7 +57,7 @@ ">>>>>>>> \tunsigned long env;\n" ">>>>>>>> } func_descr_t;\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" @@ -141,4 +139,4 @@ ">>> Thank you,\n" >>> -aee0e4047024c103947162340bdb27ecc33bd9266ad4ffd848b04cfc03aae1d9 +7097cfcc88a2469a5028960fb333b0aebf2d0c18b5ad7a37161c7814df68645a
diff --git a/a/1.txt b/N2/1.txt index d819fbb..30ac31e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,7 +17,7 @@ On 06/19/2014 12:56 PM, Masami Hiramatsu wrote: >>>>>>>> unsigned long env; >>>>>>>> } func_descr_t; >>>>>>>> ->>>>>>>> +#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 bfe0479..e35744b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,7 +9,7 @@ "ref\053A2908E.2000806@hitachi.com\0" "From\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" "Subject\0Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Thu, 19 Jun 2014 09:57:26 +0000\0" + "Date\0Thu, 19 Jun 2014 15:15:26 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Cc\0Michael Ellerman <mpe@ellerman.id.au>" Benjamin Herrenschmidt <benh@kernel.crashing.org> @@ -59,7 +59,7 @@ ">>>>>>>> \tunsigned long env;\n" ">>>>>>>> } func_descr_t;\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" @@ -141,4 +141,4 @@ ">>> Thank you,\n" >>> -aee0e4047024c103947162340bdb27ecc33bd9266ad4ffd848b04cfc03aae1d9 +56fa48e32f4c088bb19d7ebd7c24521e5e4d1f3c99229d43893253a28bf7ec13
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.