diff for duplicates of <536B18B0.9060209@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index dbf7371..63e6832 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ > > ... > ->> +#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 74633bf..e0e37db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,14 +3,13 @@ "ref\020140508044753.GA13413@in.ibm.com\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\0Thu, 08 May 2014 05:40:00 +0000\0" + "Date\0Thu, 08 May 2014 14:40:00 +0900\0" "To\0ananth@in.ibm.com\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - Paul Mackerras <paulus@samba.org> - Tony Luck <tony.luck@gmail.com> - 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 @@ -24,12 +23,12 @@ akataria@vmware.com Tony Luck <tony.luck@intel.com> Kevin Hao <haokexin@gmail.com> - linuxppc-dev@lists.ozlabs.org + Linus Torvalds <torvalds@linux-foundation.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> - Linus Torvalds <torvalds@linux-foundation.org> + linuxppc-dev@lists.ozlabs.org " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" @@ -38,7 +37,7 @@ "> \n" "> ...\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" @@ -75,4 +74,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -79f739b06a0d71490000b3acd14fd618ecc902e06d3e72447d2c823ba155fe93 +fae2b512223d0cb82d6ecba6ee89f9b9b5dd35f01704aa9bd0bdd941fd77c7ba
diff --git a/a/1.txt b/N2/1.txt index dbf7371..63e6832 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ > > ... > ->> +#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 74633bf..2bfc38b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\020140508044753.GA13413@in.ibm.com\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\0Thu, 08 May 2014 05:40:00 +0000\0" + "Date\0Thu, 08 May 2014 14:40:00 +0900\0" "To\0ananth@in.ibm.com\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> @@ -38,7 +38,7 @@ "> \n" "> ...\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" @@ -75,4 +75,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -79f739b06a0d71490000b3acd14fd618ecc902e06d3e72447d2c823ba155fe93 +b16b59acfeff3061a1bd48104ed501757ff186a1c9db47073cce4f22c122ae72
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.