diff options
| -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 ed04d1372d5d..288ad490a6dd 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 3c77dd36994c..131d7ee8b416 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) |
