Skip to content

Commit

Permalink
powerpc/jump_label: use HAVE_JUMP_LABEL?
Browse files Browse the repository at this point in the history
CONFIG_JUMP_LABEL doesn't ensure HAVE_JUMP_LABEL, if it
is not the case use maintainers's own mutex to guard
the modification of global values.

Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Zhouyi Zhou authored and Michael Ellerman committed Sep 25, 2014
1 parent 22e55fc commit d4fe096
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/powernv/opal-tracepoints.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <linux/jump_label.h>
#include <asm/trace.h>

#ifdef CONFIG_JUMP_LABEL
#ifdef HAVE_JUMP_LABEL
struct static_key opal_tracepoint_key = STATIC_KEY_INIT;

void opal_tracepoint_regfunc(void)
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/pseries/lpar.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ EXPORT_SYMBOL(arch_free_page);
#endif

#ifdef CONFIG_TRACEPOINTS
#ifdef CONFIG_JUMP_LABEL
#ifdef HAVE_JUMP_LABEL
struct static_key hcall_tracepoint_key = STATIC_KEY_INIT;

void hcall_tracepoint_regfunc(void)
Expand Down

0 comments on commit d4fe096

Please sign in to comment.