diff for duplicates of <539161D6.7020508@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index bc51d25..2fcdbb9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,7 +86,7 @@ I guess this should go to 3.16 branch, shouldn't it? > 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 e32fbe2..fd14d7a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020140530031838.17427.75896.stgit@ltc230.yrl.intra.hitachi.co.jp\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\0Fri, 06 Jun 2014 06:38:14 +0000\0" + "Date\0Fri, 06 Jun 2014 15:38:14 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Suzuki K. Poulose <suzuki@in.ibm.com> Tony Luck <tony.luck@gmail.com> @@ -23,13 +23,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" @@ -121,7 +120,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" @@ -195,4 +194,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -99738244971a077666dd7909b37ab08562e0a96a9625bd3286dd067f0241ff35 +1df2ec0bbefa6ebc8c86146ef032d994833fe8ccdc9fb5f952d4c3c51fc5377d
diff --git a/a/1.txt b/N2/1.txt index bc51d25..2fcdbb9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -86,7 +86,7 @@ I guess this should go to 3.16 branch, shouldn't it? > 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 e32fbe2..d843f79 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020140530031838.17427.75896.stgit@ltc230.yrl.intra.hitachi.co.jp\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\0Fri, 06 Jun 2014 06:38:14 +0000\0" + "Date\0Fri, 06 Jun 2014 15:38:14 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Suzuki K. Poulose <suzuki@in.ibm.com> Tony Luck <tony.luck@gmail.com> @@ -121,7 +121,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" @@ -195,4 +195,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -99738244971a077666dd7909b37ab08562e0a96a9625bd3286dd067f0241ff35 +61b864a2461478c0122cd3c101a6b5d3c4de9264bb15e97c524f077d3d43ff06
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.