diff for duplicates of <53B0D61B.9010104@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 88e62b0..abc37ef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -89,7 +89,7 @@ Ping? :) > 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 5acbd4b..66f177c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020140620022307.23075.55858.stgit@kbuild-fedora.novalocal\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [PATCH v4] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Mon, 30 Jun 2014 03:14:35 +0000\0" + "Date\0Mon, 30 Jun 2014 12:14:35 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -9,11 +9,10 @@ linux-ia64@vger.kernel.org sparse@chrisli.org H. Peter Anvin <hpa@zytor.com> - Ingo Molnar <mingo@kernel.org> - linux-tip-commits@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> akataria@vmware.com + 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> @@ -23,13 +22,12 @@ Thomas Gleixner <tglx@linutronix.de> Tony Luck <tony.luck@intel.com> Kevin Hao <haokexin@gmail.com> - Ananth N Mavinakayanahalli <ananth@in.ibm.com> - linuxppc-dev@lists.ozlabs.org + Linus Torvalds <torvalds@linux-foundation.org> rdunlap@infradead.org Linux Kernel Mailing List <linux-kernel@vger.kernel.org> 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" @@ -124,7 +122,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" @@ -204,4 +202,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -78286b648dfe37aeb583e5d5a6c416d85b80da37af16cee0801fcf9919cd7e0b +e920f8c62a897d925206dcb9f15e5a142bed269f306c4907115b146dc8291a06
diff --git a/a/1.txt b/N2/1.txt index 88e62b0..abc37ef 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -89,7 +89,7 @@ Ping? :) > 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 5acbd4b..542fc53 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020140620022307.23075.55858.stgit@kbuild-fedora.novalocal\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [PATCH v4] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Mon, 30 Jun 2014 03:14:35 +0000\0" + "Date\0Mon, 30 Jun 2014 12:14:35 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -124,7 +124,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" @@ -204,4 +204,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -78286b648dfe37aeb583e5d5a6c416d85b80da37af16cee0801fcf9919cd7e0b +3169e5b5335ed7dda9971bcc869d0bb4fa6d1a129e4a697da34c27ca39d16073
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.