]> git.karo-electronics.de Git - linux-beck.git/commitdiff
powerpc/jump_label: Use HAVE_JUMP_LABEL
authorAnton Blanchard <anton@samba.org>
Thu, 30 Oct 2014 04:43:43 +0000 (15:43 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 9 Nov 2014 22:59:30 +0000 (09:59 +1100)
Commit d4fe0965e208 ("powerpc/jump_label: use HAVE_JUMP_LABEL?")
missed a few conversions. Change the remaining uses of
CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/opal-wrappers.S
arch/powerpc/platforms/pseries/hvCall.S

index feb549aa3eea98ee5369f6c3ecf5087dc871b4d8..cf7266de4c2fe5ae255d61e2f2dafaf33697932a 100644 (file)
@@ -18,7 +18,7 @@
        .section        ".text"
 
 #ifdef CONFIG_TRACEPOINTS
-#ifdef CONFIG_JUMP_LABEL
+#ifdef HAVE_JUMP_LABEL
 #define OPAL_BRANCH(LABEL)                                     \
        ARCH_STATIC_BRANCH(LABEL, opal_tracepoint_key)
 #else
index 3fda3f17b84ecb47541618c5ca3417ee5a42ed82..ccd53f91e8aa8e4f3b30bc550f55a63f509818a8 100644 (file)
@@ -18,7 +18,7 @@
        
 #ifdef CONFIG_TRACEPOINTS
 
-#ifndef CONFIG_JUMP_LABEL
+#ifndef HAVE_JUMP_LABEL
        .section        ".toc","aw"
 
        .globl hcall_tracepoint_refcount
@@ -78,7 +78,7 @@ hcall_tracepoint_refcount:
        mr      r5,BUFREG;                                      \
        __HCALL_INST_POSTCALL
 
-#ifdef CONFIG_JUMP_LABEL
+#ifdef HAVE_JUMP_LABEL
 #define HCALL_BRANCH(LABEL)                                    \
        ARCH_STATIC_BRANCH(LABEL, hcall_tracepoint_key)
 #else