Commit 47f7c6cf authored by Kefeng Wang's avatar Kefeng Wang Committed by Vasily Gorbik

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: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 2bb919b6
...@@ -92,11 +92,6 @@ static void copy_instruction(struct kprobe *p) ...@@ -92,11 +92,6 @@ static void copy_instruction(struct kprobe *p)
} }
NOKPROBE_SYMBOL(copy_instruction); 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) static int s390_get_insn_slot(struct kprobe *p)
{ {
/* /*
...@@ -105,7 +100,7 @@ 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. * field can be patched and executed within the insn slot.
*/ */
p->ainsn.insn = NULL; p->ainsn.insn = NULL;
if (is_kernel_addr(p->addr)) if (is_kernel((unsigned long)p->addr))
p->ainsn.insn = get_s390_insn_slot(); p->ainsn.insn = get_s390_insn_slot();
else if (is_module_addr(p->addr)) else if (is_module_addr(p->addr))
p->ainsn.insn = get_insn_slot(); p->ainsn.insn = get_insn_slot();
...@@ -117,7 +112,7 @@ static void s390_free_insn_slot(struct kprobe *p) ...@@ -117,7 +112,7 @@ static void s390_free_insn_slot(struct kprobe *p)
{ {
if (!p->ainsn.insn) if (!p->ainsn.insn)
return; return;
if (is_kernel_addr(p->addr)) if (is_kernel((unsigned long)p->addr))
free_s390_insn_slot(p->ainsn.insn, 0); free_s390_insn_slot(p->ainsn.insn, 0);
else else
free_insn_slot(p->ainsn.insn, 0); free_insn_slot(p->ainsn.insn, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment