Merge tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux

[karo-tx-linux.git] / arch / arm / mm / alignment.c

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 83792f4324ead79f82587b25226ecc65732293fc..2c0c541c60caaafe76943ec3bb65a79da990f5c2 100644 (file)
--- 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)
                new_usermode |= UM_FIXUP;
 
                if (warn)
-                       printk(KERN_WARNING "alignment: ignoring faults is unsafe on this CPU.  Defaulting to fixup mode.\n");
+                       pr_warn("alignment: ignoring faults is unsafe on this CPU.  Defaulting to fixup mode.\n");
        }
 
        return new_usermode;
@@ -523,7 +523,7 @@ do_alignment_ldmstm(unsigned long addr, unsigned long instr, struct pt_regs *reg
         * processor for us.
         */
        if (addr != eaddr) {
-               printk(KERN_ERR "LDMSTM: PC = %08lx, instr = %08lx, "
+               pr_err("LDMSTM: PC = %08lx, instr = %08lx, "
                        "addr = %08lx, eaddr = %08lx\n",
                         instruction_pointer(regs), instr, addr, eaddr);
                show_regs(regs);
@@ -567,7 +567,7 @@ fault:
        return TYPE_FAULT;
 
 bad:
-       printk(KERN_ERR "Alignment trap: not handling ldm with s-bit set\n");
+       pr_err("Alignment trap: not handling ldm with s-bit set\n");
        return TYPE_ERROR;
 }
 
@@ -899,13 +899,13 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
        return 0;
 
  swp:
-       printk(KERN_ERR "Alignment trap: not handling swp instruction\n");
+       pr_err("Alignment trap: not handling swp instruction\n");
 
  bad:
        /*
         * Oops, we didn't handle the instruction.
         */
-       printk(KERN_ERR "Alignment trap: not handling instruction "
+       pr_err("Alignment trap: not handling instruction "
                "%0*lx at [<%08lx>]\n",
                isize << 1,
                isize == 2 ? tinstr : instr, instrptr);