diff for duplicates of <53A15201.7060404@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 6f8c768..eabbe3f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,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 efcbc78..7380b4e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,21 +3,20 @@ "ref\0539161D6.7020508@hitachi.com\0" "ref\01403078179.32307.7.camel@concordia\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc6\0" - "Date\0Wed, 18 Jun 2014 08:46:57 +0000\0" + "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" + "Date\0Wed, 18 Jun 2014 17:46:57 +0900\0" "To\0Michael Ellerman <michael@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> @@ -26,12 +25,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" @@ -49,7 +48,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" @@ -76,4 +75,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -a58bc641c8ff13bafc6cf5b55b9e17f297259330de4a26bc14a2a67c4de93761 +a453da926efbab266fe8295bcca1655966f695bd01b137edbca0168281776e35
diff --git a/a/1.txt b/N2/1.txt index 6f8c768..eabbe3f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,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 efcbc78..a6fccb6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,8 @@ "ref\0539161D6.7020508@hitachi.com\0" "ref\01403078179.32307.7.camel@concordia\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc6\0" - "Date\0Wed, 18 Jun 2014 08:46:57 +0000\0" + "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" + "Date\0Wed, 18 Jun 2014 17:46:57 +0900\0" "To\0Michael Ellerman <michael@ellerman.id.au>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Suzuki K. Poulose <suzuki@in.ibm.com> @@ -49,7 +49,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" @@ -76,4 +76,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -a58bc641c8ff13bafc6cf5b55b9e17f297259330de4a26bc14a2a67c4de93761 +4a3b5db1f74554a0bba6e99afeb3c714391692dce0e3ff7894afda6ef0f6b61d
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.