From 5b0e053462fba4d3f578ccb68d1ad92b48de1410 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Mon, 14 Jul 2008 09:59:41 +0200 Subject: [PATCH] --- yaml --- r: 99009 b: refs/heads/master c: 5532bd0f8591a5f61cfe903646e1f55e047bae90 h: refs/heads/master i: 99007: da6f5cb249ac6f96dd5d1ae732a45dcd9f3038dd v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/kprobes.c | 4 +--- trunk/arch/s390/kernel/machine_kexec.c | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f35baf45c913..44095ead51de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d130066801af8f0a0ea8c70c9c7374c51fd1a92 +refs/heads/master: 5532bd0f8591a5f61cfe903646e1f55e047bae90 diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c index ed04d1372d5d..288ad490a6dd 100644 --- a/trunk/arch/s390/kernel/kprobes.c +++ b/trunk/arch/s390/kernel/kprobes.c @@ -41,10 +41,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) if (is_prohibited_opcode((kprobe_opcode_t *) p->addr)) return -EINVAL; - if ((unsigned long)p->addr & 0x01) { - printk("Attempt to register kprobe at an unaligned address\n"); + if ((unsigned long)p->addr & 0x01) return -EINVAL; - } /* Use the get_insn_slot() facility for correctness */ if (!(p->ainsn.insn = get_insn_slot())) diff --git a/trunk/arch/s390/kernel/machine_kexec.c b/trunk/arch/s390/kernel/machine_kexec.c index 3c77dd36994c..131d7ee8b416 100644 --- a/trunk/arch/s390/kernel/machine_kexec.c +++ b/trunk/arch/s390/kernel/machine_kexec.c @@ -52,7 +52,6 @@ void machine_kexec_cleanup(struct kimage *image) void machine_shutdown(void) { - printk(KERN_INFO "kexec: machine_shutdown called\n"); } void machine_kexec(struct kimage *image)