diff options
Diffstat (limited to 'arch/arm/mm/alignment.c')
-rw-r--r-- | arch/arm/mm/alignment.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 83792f4324ea..2c0c541c60ca 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
@@ -113,7 +113,7 @@ static int safe_usermode(int new_usermode, bool warn) | |||
113 | new_usermode |= UM_FIXUP; | 113 | new_usermode |= UM_FIXUP; |
114 | 114 | ||
115 | if (warn) | 115 | if (warn) |
116 | printk(KERN_WARNING "alignment: ignoring faults is unsafe on this CPU. Defaulting to fixup mode.\n"); | 116 | pr_warn("alignment: ignoring faults is unsafe on this CPU. Defaulting to fixup mode.\n"); |
117 | } | 117 | } |
118 | 118 | ||
119 | return new_usermode; | 119 | return new_usermode; |
@@ -523,7 +523,7 @@ do_alignment_ldmstm(unsigned long addr, unsigned long instr, struct pt_regs *reg | |||
523 | * processor for us. | 523 | * processor for us. |
524 | */ | 524 | */ |
525 | if (addr != eaddr) { | 525 | if (addr != eaddr) { |
526 | printk(KERN_ERR "LDMSTM: PC = %08lx, instr = %08lx, " | 526 | pr_err("LDMSTM: PC = %08lx, instr = %08lx, " |
527 | "addr = %08lx, eaddr = %08lx\n", | 527 | "addr = %08lx, eaddr = %08lx\n", |
528 | instruction_pointer(regs), instr, addr, eaddr); | 528 | instruction_pointer(regs), instr, addr, eaddr); |
529 | show_regs(regs); | 529 | show_regs(regs); |
@@ -567,7 +567,7 @@ fault: | |||
567 | return TYPE_FAULT; | 567 | return TYPE_FAULT; |
568 | 568 | ||
569 | bad: | 569 | bad: |
570 | printk(KERN_ERR "Alignment trap: not handling ldm with s-bit set\n"); | 570 | pr_err("Alignment trap: not handling ldm with s-bit set\n"); |
571 | return TYPE_ERROR; | 571 | return TYPE_ERROR; |
572 | } | 572 | } |
573 | 573 | ||
@@ -899,13 +899,13 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
899 | return 0; | 899 | return 0; |
900 | 900 | ||
901 | swp: | 901 | swp: |
902 | printk(KERN_ERR "Alignment trap: not handling swp instruction\n"); | 902 | pr_err("Alignment trap: not handling swp instruction\n"); |
903 | 903 | ||
904 | bad: | 904 | bad: |
905 | /* | 905 | /* |
906 | * Oops, we didn't handle the instruction. | 906 | * Oops, we didn't handle the instruction. |
907 | */ | 907 | */ |
908 | printk(KERN_ERR "Alignment trap: not handling instruction " | 908 | pr_err("Alignment trap: not handling instruction " |
909 | "%0*lx at [<%08lx>]\n", | 909 | "%0*lx at [<%08lx>]\n", |
910 | isize << 1, | 910 | isize << 1, |
911 | isize == 2 ? tinstr : instr, instrptr); | 911 | isize == 2 ? tinstr : instr, instrptr); |