diff for duplicates of <53A285D0.1030106@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 8866902..34ceff8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On 06/19/2014 10:22 AM, 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 9df36e9..639ce91 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,15 +7,14 @@ "ref\053A26C99.6060000@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 06:52:16 +0000\0" + "Date\0Thu, 19 Jun 2014 12:10:16 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>" " Michael Ellerman <mpe@ellerman.id.au>\0" - "Cc\0Benjamin 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 @@ -29,12 +28,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" @@ -55,7 +54,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" @@ -112,4 +111,4 @@ "> Thank you,\n" > -181be1ea48d8ead3242fea211768624035740ff20f53c979132c00579a251f99 +df5c3496941d983d9aa4bac3136024dc6a71c1897e61115c6727915349af45ea
diff --git a/a/1.txt b/N2/1.txt index 8866902..34ceff8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,7 @@ On 06/19/2014 10:22 AM, 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 9df36e9..d6b556b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,7 +7,7 @@ "ref\053A26C99.6060000@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 06:52:16 +0000\0" + "Date\0Thu, 19 Jun 2014 12:10:16 +0530\0" "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>" " Michael Ellerman <mpe@ellerman.id.au>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" @@ -55,7 +55,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" @@ -112,4 +112,4 @@ "> Thank you,\n" > -181be1ea48d8ead3242fea211768624035740ff20f53c979132c00579a251f99 +2804cd88bf9b78ccfba42f67b4fcaa1faac99f4ae2a131871c7e37fb5753b13f
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.