From: Heiko Carstens Date: Mon, 2 Sep 2013 08:31:11 +0000 (+0200) Subject: s390/kprobes: have more correct if statement in s390_get_insn_slot() X-Git-Tag: v3.13-rc1~166^2~59 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fcd05b50fca44be3f96f8a17c5cce778669c29e7;p=~emulex%2Finfiniband.git s390/kprobes: have more correct if statement in s390_get_insn_slot() When checking the insn address wether it is a kernel image or module address it should be an if-else-if statement not two independent if statements. This doesn't really fix a bug, but matches s390_free_insn_slot(). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index d86e64eddb4..9f99ad7fc21 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c @@ -252,7 +252,7 @@ static int __kprobes s390_get_insn_slot(struct kprobe *p) p->ainsn.insn = NULL; if (is_kernel_addr(p->addr)) p->ainsn.insn = get_dmainsn_slot(); - if (is_module_addr(p->addr)) + else if (is_module_addr(p->addr)) p->ainsn.insn = get_insn_slot(); return p->ainsn.insn ? 0 : -ENOMEM; }