Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / kernel / single_step.c

diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c
index 6cb2ce3..8629730 100644 (file)
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@ -222,11 +222,9 @@ static tilepro_bundle_bits rewrite_load_store_unaligned(
        }
 
        if (unaligned_printk || unaligned_fixup_count == 0) {
-               pr_info("Process %d/%s: PC %#lx: Fixup of"
-                       " unaligned %s at %#lx.\n",
+               pr_info("Process %d/%s: PC %#lx: Fixup of unaligned %s at %#lx\n",
                        current->pid, current->comm, regs->pc,
-                       (mem_op == MEMOP_LOAD ||
-                        mem_op == MEMOP_LOAD_POSTINCR) ?
+                       mem_op == MEMOP_LOAD || mem_op == MEMOP_LOAD_POSTINCR ?
                        "load" : "store",
                        (unsigned long)addr);
                if (!unaligned_printk) {