diff for duplicates of <536A2013.8020609@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 6884289..5d311c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -79,7 +79,7 @@ Thank you, > 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 3ca9b9d..c4e2a2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020140507115551.22259.70581.stgit@ltc230.yrl.intra.hitachi.co.jp\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Wed, 07 May 2014 11:59:15 +0000\0" + "Date\0Wed, 07 May 2014 20:59:15 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -22,13 +22,12 @@ akataria@vmware.com 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" @@ -113,7 +112,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" @@ -173,4 +172,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -49cb746ecdf0521d494665ec47429b4feca4ab5debaf69bdb65005c075d617ab +7d1246e4cdfc10fd6fb4e7f86755cab06dfab1e67a3a7be6f850f4ecc485016b
diff --git a/a/1.txt b/N2/1.txt index 6884289..5d311c9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -79,7 +79,7 @@ Thank you, > 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 3ca9b9d..fd7f543 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020140507115551.22259.70581.stgit@ltc230.yrl.intra.hitachi.co.jp\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Wed, 07 May 2014 11:59:15 +0000\0" + "Date\0Wed, 07 May 2014 20:59:15 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -113,7 +113,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" @@ -173,4 +173,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -49cb746ecdf0521d494665ec47429b4feca4ab5debaf69bdb65005c075d617ab +41294c851c101edbfdcd2a93e3b8b988e7c8f7c5134e7c72f7f556bb424c74dd
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.