Message ID | 20161013020714.5629-1-npiggin@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On 13/10/16 13:07, Nicholas Piggin wrote: > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > The linker orphan sections error patch caught this Seems reasonable Acked-by: Balbir Singh <bsingharora@gmail.com>
Nicholas Piggin <npiggin@gmail.com> writes: > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > The linker orphan sections error patch caught this You mean with the orphan sections patch applied this breaks the build when KPROBES=n right? cheers
On Fri, 14 Oct 2016 11:48:35 +1100 Michael Ellerman <mpe@ellerman.id.au> wrote: > Nicholas Piggin <npiggin@gmail.com> writes: > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > > --- > > The linker orphan sections error patch caught this > > You mean with the orphan sections patch applied this breaks the build > when KPROBES=n right? Yes. The linker orphan patch got picked up by one of the CI tests after I posted it, and pointed this out (I obviously didn't test KPROBES=n case). Thanks, Nick
On Thu, 2016-13-10 at 02:07:14 UTC, Nicholas Piggin wrote:
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/c0a5149105ab5f76f7c5a8fc2eb3d7
cheers
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index c73750b..ceec199 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -265,10 +265,14 @@ GLUE(.,name): * latter is for those that incdentially must be excluded from probing * and allows them to be linked at more optimal location within text. */ +#ifdef CONFIG_KPROBES #define _ASM_NOKPROBE_SYMBOL(entry) \ .pushsection "_kprobe_blacklist","aw"; \ PPC_LONG (entry) ; \ .popsection +#else +#define _ASM_NOKPROBE_SYMBOL(entry) +#endif #define FUNC_START(name) _GLOBAL(name) #define FUNC_END(name)
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- The linker orphan sections error patch caught this arch/powerpc/include/asm/ppc_asm.h | 4 ++++ 1 file changed, 4 insertions(+)