diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
| commit | eac0556750e727ff39144a9a9e59d5ccf1fc0e2a (patch) | |
| tree | f5ccff7795b2ad5e47f17fb475599c526f533e79 /arch/arm/include | |
| parent | f71fa31f9f7ac33cba12b8897983f950ad2c7a5b (diff) | |
| parent | 19853301ef3289bda2d5264c1093e74efddaeab9 (diff) | |
Merge branch 'linus' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/jump_label.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h index 5c5ca2ea62b0..bfc198c75913 100644 --- a/arch/arm/include/asm/jump_label.h +++ b/arch/arm/include/asm/jump_label.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #define JUMP_LABEL_NOP "nop" | 14 | #define JUMP_LABEL_NOP "nop" |
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | static __always_inline bool arch_static_branch(struct jump_label_key *key) | 17 | static __always_inline bool arch_static_branch(struct static_key *key) |
| 18 | { | 18 | { |
| 19 | asm goto("1:\n\t" | 19 | asm goto("1:\n\t" |
| 20 | JUMP_LABEL_NOP "\n\t" | 20 | JUMP_LABEL_NOP "\n\t" |