diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-07-14 03:59:41 -0400 |
---|---|---|
committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 04:02:24 -0400 |
commit | 5532bd0f8591a5f61cfe903646e1f55e047bae90 (patch) | |
tree | 91d8f57ed2281c94342cc01bb0173428fd27bb48 /arch/s390 | |
parent | 0d130066801af8f0a0ea8c70c9c7374c51fd1a92 (diff) |
[S390] Cleanup kprobes printk messages.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/kprobes.c | 4 | ||||
-rw-r--r-- | arch/s390/kernel/machine_kexec.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index ed04d1372d5..288ad490a6d 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
@@ -41,10 +41,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) | |||
41 | if (is_prohibited_opcode((kprobe_opcode_t *) p->addr)) | 41 | if (is_prohibited_opcode((kprobe_opcode_t *) p->addr)) |
42 | return -EINVAL; | 42 | return -EINVAL; |
43 | 43 | ||
44 | if ((unsigned long)p->addr & 0x01) { | 44 | if ((unsigned long)p->addr & 0x01) |
45 | printk("Attempt to register kprobe at an unaligned address\n"); | ||
46 | return -EINVAL; | 45 | return -EINVAL; |
47 | } | ||
48 | 46 | ||
49 | /* Use the get_insn_slot() facility for correctness */ | 47 | /* Use the get_insn_slot() facility for correctness */ |
50 | if (!(p->ainsn.insn = get_insn_slot())) | 48 | if (!(p->ainsn.insn = get_insn_slot())) |
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index 3c77dd36994..131d7ee8b41 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c | |||
@@ -52,7 +52,6 @@ void machine_kexec_cleanup(struct kimage *image) | |||
52 | 52 | ||
53 | void machine_shutdown(void) | 53 | void machine_shutdown(void) |
54 | { | 54 | { |
55 | printk(KERN_INFO "kexec: machine_shutdown called\n"); | ||
56 | } | 55 | } |
57 | 56 | ||
58 | void machine_kexec(struct kimage *image) | 57 | void machine_kexec(struct kimage *image) |