diff for duplicates of <538329F3.7090806@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 3181fce..4ebd0e2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,7 +72,7 @@ >> 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 cb734de..d2c00a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,14 +3,13 @@ "ref\05383249A.6060407@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\0Mon, 26 May 2014 11:48:03 +0000\0" + "Date\0Mon, 26 May 2014 20:48:03 +0900\0" "To\0Suzuki K. Poulose <suzuki@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> - Linus Torvalds <torvalds@linux-foundation.org> + linuxppc-dev@lists.ozlabs.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> - linuxppc-dev@lists.ozlabs.org + Linus Torvalds <torvalds@linux-foundation.org> " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" @@ -107,7 +106,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" @@ -183,4 +182,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -2da912e67a2c3769dfa82bbc1b3201165faf0d37811f9d6f2a01821771be8fb9 +8c445cebd46f6fc62aa45912026a144b3b5ca19e4b3e70e2071e4fb05b25b6e5
diff --git a/a/1.txt b/N2/1.txt index 3181fce..4ebd0e2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -72,7 +72,7 @@ >> 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 cb734de..cbe5bef 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\05383249A.6060407@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\0Mon, 26 May 2014 11:48:03 +0000\0" + "Date\0Mon, 26 May 2014 20:48:03 +0900\0" "To\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> @@ -107,7 +107,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" @@ -183,4 +183,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -2da912e67a2c3769dfa82bbc1b3201165faf0d37811f9d6f2a01821771be8fb9 +05d0b4da463a107c2f9be3e3c02ebc82a391d126d68eac42c0fb624ea298103e
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.