From: Nicholas Piggin <npiggin@gmail.com>
Date: Thu, 13 Oct 2016 02:07:14 +0000 (+1100)
Subject: powerpc: Make _ASM_NOKPROBE_SYMBOL a noop when KPROBES not defined
X-Git-Tag: Ubuntu-4.10.0-19.21~1968^2~127
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c0a5149105ab5f76f7c5a8fc2eb3d79fe3de6582;p=mirror_ubuntu-artful-kernel.git

powerpc: Make _ASM_NOKPROBE_SYMBOL a noop when KPROBES not defined

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index bf9de5575ca9..025833b8df9f 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -263,10 +263,14 @@ n:
  * 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)