Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc9e47a authored Oct 30, 2014 by Anton Blanchard Committed by Michael Ellerman Nov 10, 2014

powerpc/jump_label: Use HAVE_JUMP_LABEL



Commit d4fe0965 ("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>

parent 4b4b13d5

arch/powerpc/platforms/powernv/opal-wrappers.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/powerpc/platforms/pseries/hvCall.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -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