s390/kprobes: use is_kernel() helper

Use is_kernel() helper instead of is_kernel_addr().

[hca@linux.ibm.com: add missing unsigned long cast]
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 528bb31815c311e76cd7914d11bf315ab937d410..52d056a5f89fc3f3e7c49c72467c4dc3a55c2414 100644 (file)
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -92,11 +92,6 @@ static void copy_instruction(struct kprobe *p)
 }
 NOKPROBE_SYMBOL(copy_instruction);
 
-static inline int is_kernel_addr(void *addr)
-{
-       return addr < (void *)_end;
-}
-
 static int s390_get_insn_slot(struct kprobe *p)
 {
        /*
@@ -105,7 +100,7 @@ static int s390_get_insn_slot(struct kprobe *p)
         * field can be patched and executed within the insn slot.
         */
        p->ainsn.insn = NULL;
-       if (is_kernel_addr(p->addr))
+       if (is_kernel((unsigned long)p->addr))
                p->ainsn.insn = get_s390_insn_slot();
        else if (is_module_addr(p->addr))
                p->ainsn.insn = get_insn_slot();
@@ -117,7 +112,7 @@ static void s390_free_insn_slot(struct kprobe *p)
 {
        if (!p->ainsn.insn)
                return;
-       if (is_kernel_addr(p->addr))
+       if (is_kernel((unsigned long)p->addr))
                free_s390_insn_slot(p->ainsn.insn, 0);
        else
                free_insn_slot(p->ainsn.insn, 0);