Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "A set of MIPS fixes for 4.9:

   - lots of fixes for printk continuations
   - six fixes for FP related code.
   - fix max_low_pfn with disabled highmem
   - fix KASLR handling of NULL FDT and KASLR for generic kernels
   - fix build of compressed image
   - provide default mips_cpc_default_phys_base to ignore CPC
   - fix reboot on Malta"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix max_low_pfn with disabled highmem
  MIPS: Correct MIPS I FP sigcontext layout
  MIPS: Fix ISA I/II FP signal context offsets
  MIPS: Remove FIR from ISA I FP signal context
  MIPS: Fix ISA I FP sigcontext access violation handling
  MIPS: Fix FCSR Cause bit handling for correct SIGFPE issue
  MIPS: ptrace: Also initialize the FP context on individual FCSR writes
  MIPS: dump_tlb: Fix printk continuations
  MIPS: Fix __show_regs() output
  MIPS: traps: Fix output of show_code
  MIPS: traps: Fix output of show_stacktrace
  MIPS: traps: Fix output of show_backtrace
  MIPS: Fix build of compressed image
  MIPS: generic: Fix KASLR for generic kernel.
  MIPS: KASLR: Fix handling of NULL FDT
  MIPS: Malta: Fixup reboot
  MIPS: CPC: Provide default mips_cpc_default_phys_base to ignore CPC

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c
index 744f4a7bc49d..85b4086e553e 100644
--- a/arch/mips/lib/r3k_dump_tlb.c
+++ b/arch/mips/lib/r3k_dump_tlb.c
@@ -53,15 +53,15 @@ static void dump_tlb(int first, int last)
                          */
                         printk("Index: %2d ", i);
 
-                        printk("va=%08lx asid=%08lx"
-                               "  [pa=%06lx n=%d d=%d v=%d g=%d]",
-                               entryhi & PAGE_MASK,
-                               entryhi & asid_mask,
-                               entrylo0 & PAGE_MASK,
-                               (entrylo0 & R3K_ENTRYLO_N) ? 1 : 0,
-                               (entrylo0 & R3K_ENTRYLO_D) ? 1 : 0,
-                               (entrylo0 & R3K_ENTRYLO_V) ? 1 : 0,
-                               (entrylo0 & R3K_ENTRYLO_G) ? 1 : 0);
+                        pr_cont("va=%08lx asid=%08lx"
+                                "  [pa=%06lx n=%d d=%d v=%d g=%d]",
+                                entryhi & PAGE_MASK,
+                                entryhi & asid_mask,
+                                entrylo0 & PAGE_MASK,
+                                (entrylo0 & R3K_ENTRYLO_N) ? 1 : 0,
+                                (entrylo0 & R3K_ENTRYLO_D) ? 1 : 0,
+                                (entrylo0 & R3K_ENTRYLO_V) ? 1 : 0,
+                                (entrylo0 & R3K_ENTRYLO_G) ? 1 : 0);
                 }
         }
         printk("\n");