Merge tag 'mac80211-for-davem-2015-09-22' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / arch / s390 / kernel / jump_label.c

diff --git a/arch/s390/kernel/jump_label.c b/arch/s390/kernel/jump_label.c
index c9dac2139f59efcfb101200e96bfd0f143f5e761..083b05f5f5ab6f9b48d4028c2e8ec402e2e01af9 100644 (file)
--- a/arch/s390/kernel/jump_label.c
+++ b/arch/s390/kernel/jump_label.c
@@ -61,7 +61,7 @@ static void __jump_label_transform(struct jump_entry *entry,
 {
        struct insn old, new;
 
-       if (type == JUMP_LABEL_ENABLE) {
+       if (type == JUMP_LABEL_JMP) {
                jump_label_make_nop(entry, &old);
                jump_label_make_branch(entry, &new);
        } else {