git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pwm/for-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
jump_label.c
diff --git
a/arch/arm/kernel/jump_label.c
b/arch/arm/kernel/jump_label.c
index e39cbf488cfebc466340c139168aa0bbfc485f10..845a5dd9c42ba34503b550336852bf3a6ad79264 100644
(file)
--- a/
arch/arm/kernel/jump_label.c
+++ b/
arch/arm/kernel/jump_label.c
@@
-12,7
+12,7
@@
static void __arch_jump_label_transform(struct jump_entry *entry,
void *addr = (void *)entry->code;
unsigned int insn;
- if (type == JUMP_LABEL_
ENABLE
)
+ if (type == JUMP_LABEL_
JMP
)
insn = arm_gen_branch(entry->code, entry->target);
else
insn = arm_gen_nop();