diff for duplicates of <53A2908E.2000806@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 335b919..6443f40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,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 0eeca43..2b3bba8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,16 +7,14 @@ "ref\053A26C99.6060000@hitachi.com\0" "ref\053A285D0.1030106@in.ibm.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc6\0" - "Date\0Thu, 19 Jun 2014 07:26:06 +0000\0" + "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" + "Date\0Thu, 19 Jun 2014 16:26:06 +0900\0" "To\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" - "Cc\0Michael Ellerman <mpe@ellerman.id.au>" - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Tony Luck <tony.luck@gmail.com> - Paul Mackerras <paulus@samba.org> - 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 @@ -30,12 +28,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" @@ -57,7 +55,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" @@ -127,4 +125,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -8c9c9b9c41cee4161d7c2be9fbb570b2f6605068fb8c1439f431453d72b8783d +6584f548dbe255582df5b2ced4df8a44adb72712aabcb28a171107931702ff3e
diff --git a/a/1.txt b/N2/1.txt index 335b919..6443f40 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,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 0eeca43..a60f51d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,8 +7,8 @@ "ref\053A26C99.6060000@hitachi.com\0" "ref\053A285D0.1030106@in.ibm.com\0" "From\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0" - "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc6\0" - "Date\0Thu, 19 Jun 2014 07:26:06 +0000\0" + "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0" + "Date\0Thu, 19 Jun 2014 16:26:06 +0900\0" "To\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" "Cc\0Michael Ellerman <mpe@ellerman.id.au>" Benjamin Herrenschmidt <benh@kernel.crashing.org> @@ -57,7 +57,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" @@ -127,4 +127,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -8c9c9b9c41cee4161d7c2be9fbb570b2f6605068fb8c1439f431453d72b8783d +dd63ad4450a8eff3428cff0b0ca91f6a8b7417f9febf491f42f6565e50b414ee
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.