diff for duplicates of <53A26C99.6060000@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 1187044..525d2f6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ >>>>> 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 cdb4d24..217a52f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,20 +6,19 @@ "ref\01403141433.4768.1.camel@concordia\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.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 04:52:41 +0000\0" + "Date\0Thu, 19 Jun 2014 13:52:41 +0900\0" "To\0Michael Ellerman <mpe@ellerman.id.au>\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - Suzuki K. Poulose <suzuki@in.ibm.com> - 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 anil.s.keshavamurthy@intel.com Ingo Molnar <mingo@kernel.org> + Suzuki K. Poulose <suzuki@in.ibm.com> Fenghua Yu <fenghua.yu@intel.com> Arnd Bergmann <arnd@arndb.de> Rusty Russell <rusty@rustcorp.com.au> @@ -28,12 +27,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" @@ -53,7 +52,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" @@ -100,4 +99,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -3065f7a568f94cf2f5dcdbeb48dfd46bc537bc3f0c6f6973599eaf74f271707d +759073d399574ac4e7215861e957e97e8c04b4479e7012d737d9c45b4dc19dd1
diff --git a/a/1.txt b/N2/1.txt index 1187044..525d2f6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -14,7 +14,7 @@ >>>>> 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 cdb4d24..d77715c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,7 +6,7 @@ "ref\01403141433.4768.1.camel@concordia\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.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 04:52:41 +0000\0" + "Date\0Thu, 19 Jun 2014 13:52:41 +0900\0" "To\0Michael Ellerman <mpe@ellerman.id.au>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Suzuki K. Poulose <suzuki@in.ibm.com> @@ -53,7 +53,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" @@ -100,4 +100,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -3065f7a568f94cf2f5dcdbeb48dfd46bc537bc3f0c6f6973599eaf74f271707d +36753e274ad3a2b126755fcfc3c20ab06c7d0020e887362d816d5e8c31f05288
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.