diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:47 +0100 |
| commit | a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5 (patch) | |
| tree | 9fcffea752514702a78a8f6177d995964761559d /arch/powerpc/include | |
| parent | 83b8450317a1441aef5d110cbc4102d53df9ec02 (diff) | |
| parent | c5905afb0ee6550b42c49213da1c22d67316c194 (diff) | |
| download | kernel_goldelico_gta04-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.zip kernel_goldelico_gta04-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.gz kernel_goldelico_gta04-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.bz2 | |
Merge branch 'perf/jump-labels' into perf/core
Merge reason: After much naming discussion, there seems to be consensus
now - queue it up for v3.4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/jump_label.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h index 938986e..ae098c4 100644 --- a/arch/powerpc/include/asm/jump_label.h +++ b/arch/powerpc/include/asm/jump_label.h @@ -17,7 +17,7 @@ #define JUMP_ENTRY_TYPE stringify_in_c(FTR_ENTRY_LONG) #define JUMP_LABEL_NOP_SIZE 4 -static __always_inline bool arch_static_branch(struct jump_label_key *key) +static __always_inline bool arch_static_branch(struct static_key *key) { asm goto("1:\n\t" "nop\n\t" |