2008-06-25 14:44:45

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 10/21] Cleanup kprobes printk messages.

From: Martin Schwidefsky <[email protected]>

Signed-off-by: Martin Schwidefsky <[email protected]>
---

arch/s390/kernel/kprobes.c | 4 +---
arch/s390/kernel/machine_kexec.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)

Index: quilt-2.6/arch/s390/kernel/kprobes.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/kprobes.c
+++ quilt-2.6/arch/s390/kernel/kprobes.c
@@ -41,10 +41,8 @@ int __kprobes arch_prepare_kprobe(struct
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()))
Index: quilt-2.6/arch/s390/kernel/machine_kexec.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/machine_kexec.c
+++ quilt-2.6/arch/s390/kernel/machine_kexec.c
@@ -52,7 +52,6 @@ void machine_kexec_cleanup(struct kimage

void machine_shutdown(void)
{
- printk(KERN_INFO "kexec: machine_shutdown called\n");
}

void machine_kexec(struct kimage *image)

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.