diff for duplicates of <53A2C315.9030006@hitachi.com> diff --git a/a/1.txt b/N1/1.txt index 4bf2681..fe915de 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,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 @@ -70,7 +70,7 @@ Ah, I see. So if we run func_ptr p = foo; - return p = kallsyms_lookup_name(".foo"); + return p == kallsyms_lookup_name(".foo"); it returns true. diff --git a/a/content_digest b/N1/content_digest index 2c0dce9..e482e76 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,16 +9,14 @@ "ref\053A2908E.2000806@hitachi.com\0" "ref\053A2B136.108@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 11:01:41 +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 20:01:41 +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 @@ -32,12 +30,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" @@ -61,7 +59,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" @@ -113,7 +111,7 @@ "Ah, I see. So if we run\n" "\n" " func_ptr p = foo;\n" - " return p = kallsyms_lookup_name(\".foo\");\n" + " return p == kallsyms_lookup_name(\".foo\");\n" "\n" "it returns true.\n" "\n" @@ -140,4 +138,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -3201ead9e313ff5342f49b50e758e3cac2232dabc293aee98b5507477c031622 +ea3255b5fcc66d7b075377bd6879ed09ec3344a93389b9bf63454495defee572
diff --git a/a/1.txt b/N2/1.txt index 4bf2681..fe915de 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,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 @@ -70,7 +70,7 @@ Ah, I see. So if we run func_ptr p = foo; - return p = kallsyms_lookup_name(".foo"); + return p == kallsyms_lookup_name(".foo"); it returns true. diff --git a/a/content_digest b/N2/content_digest index 2c0dce9..92b29e2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,8 +9,8 @@ "ref\053A2908E.2000806@hitachi.com\0" "ref\053A2B136.108@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 11:01:41 +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 20:01:41 +0900\0" "To\0Suzuki K. Poulose <suzuki@in.ibm.com>\0" "Cc\0Michael Ellerman <mpe@ellerman.id.au>" Benjamin Herrenschmidt <benh@kernel.crashing.org> @@ -61,7 +61,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" @@ -113,7 +113,7 @@ "Ah, I see. So if we run\n" "\n" " func_ptr p = foo;\n" - " return p = kallsyms_lookup_name(\".foo\");\n" + " return p == kallsyms_lookup_name(\".foo\");\n" "\n" "it returns true.\n" "\n" @@ -140,4 +140,4 @@ "Hitachi, Ltd., Yokohama Research Laboratory\n" E-mail: masami.hiramatsu.pt@hitachi.com -3201ead9e313ff5342f49b50e758e3cac2232dabc293aee98b5507477c031622 +5054f4dac1bd62c51f40aadf160bf63a882029001eba76c238f5c2af3146b802
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.