diff for duplicates of <53732709.1050208@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 0341791..3c65271 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -87,7 +87,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 16b45b1..1ef9413 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0536A2013.8020609@hitachi.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Wed, 14 May 2014 08:19:21 +0000\0" + "Date\0Wed, 14 May 2014 17:19:21 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -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" @@ -122,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" @@ -184,4 +183,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -31e3613a9abb629ba6fb484e99d87569a59e6433b8a4b9e9ec589ad6c3674c5d +40e130f55972595bc6a837fa681cc24d955b72156b16fbd8ade2733577f907d9
diff --git a/a/1.txt b/N2/1.txt index 0341791..3c65271 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -87,7 +87,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 16b45b1..0469eaf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\0536A2013.8020609@hitachi.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" "Subject\0Re: Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" - "Date\0Wed, 14 May 2014 08:19:21 +0000\0" + "Date\0Wed, 14 May 2014 17:19:21 +0900\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> " Tony Luck <tony.luck@gmail.com>\0" @@ -122,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" @@ -184,4 +184,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -31e3613a9abb629ba6fb484e99d87569a59e6433b8a4b9e9ec589ad6c3674c5d +8e9fc1aaf1410d1b04c5bd12122655b11fc97991c7601100e19f7b8c79c0c959
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.