]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit80e5a64d5fb1735640feda8fef02ac6c1960aadd
treebad55102344e5c77283caf22dd11a08ad073301b
parent5ea2ba275d7c5011e8af3a2425c4504404040854
ARM: 7386/1: jump_label: fixup for rename to static_key

9aa2b6019 ("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