]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: 7386/1: jump_label: fixup for rename to static_key
authorRabin Vincent <rabin@rab.in>
Sat, 14 Apr 2012 20:51:32 +0000 (21:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 15 Apr 2012 21:00:31 +0000 (22:00 +0100)
c5905afb0 ("static keys: Introduce 'struct static_key'...") renamed
struct jump_label_key to struct static_key.  Fixup ARM for this to
eliminate these build warnings:

  include/linux/jump_label.h:113:2:
  warning: passing argument 1 of 'arch_static_branch' from incompatible pointer type
  include/asm/jump_label.h:17:82:
  note: expected 'struct jump_label_key *' but argument is of type 'struct static_key *'

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/jump_label.h

index 5c5ca2ea62b04753c49b6d64eb8d9ca9214049a5..bfc198c759130109d44b73b4506ea853d01fba28 100644 (file)
@@ -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"