Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 299277
b: refs/heads/master
c: 708e597
h: refs/heads/master
i:
  299275: 8d4f411
v: v3
  • Loading branch information
Rabin Vincent authored and Russell King committed Apr 15, 2012
1 parent 1f001a4 commit 781a26d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 078c04545ba56da21567728a909a496df5ff730d
refs/heads/master: 708e5978dfee0090a27c5531ce3b017dd6d190a2
2 changes: 1 addition & 1 deletion trunk/arch/arm/include/asm/jump_label.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define JUMP_LABEL_NOP "nop"
#endif

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"
JUMP_LABEL_NOP "\n\t"
Expand Down

0 comments on commit 781a26d

Please sign in to comment.