Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Some final updates and fixes for this merge window for the parisc
  architecture. Changes include:

   - Fix boot problems with new memblock allocator on rp3410 machine

   - Increase initial kernel mapping size for 32- and 64-bit kernels,
     this allows to boot bigger kernels which have many modules built-in

   - Fix kernel layout regarding __gp and move exception table into RO
     section

   - Show trap names in crashes, use extable.h header instead of
     module.h"

* 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Show trap name in kernel crash
  parisc: Zero-initialize newly alloced memblock
  parisc: Move exception table into read-only section
  parisc: Fix kernel memory layout regarding position of __gp
  parisc: Increase initial kernel mapping size
  parisc: Migrate exception table users off module.h and onto extable.h

6 files changed, 29 insertions, 17 deletions

diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index e44bdb9078a5..c2c43f714684 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -83,10 +83,10 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, (unsigned long)pgd_val(e))
 
 /* This is the size of the initially mapped kernel memory */
-#if defined(CONFIG_64BIT) || defined(CONFIG_SMP)
-#define KERNEL_INITIAL_ORDER    25      /* 1<<25 = 32MB */
+#if defined(CONFIG_64BIT)
+#define KERNEL_INITIAL_ORDER    26      /* 1<<26 = 64MB */
 #else
-#define KERNEL_INITIAL_ORDER    24      /* 1<<24 = 16MB */
+#define KERNEL_INITIAL_ORDER    25      /* 1<<25 = 32MB */
 #endif
 #define KERNEL_INITIAL_SIZE     (1 << KERNEL_INITIAL_ORDER)
 
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h
index 5e953ab4530d..63670231f48a 100644
--- a/arch/parisc/include/asm/traps.h
+++ b/arch/parisc/include/asm/traps.h
@@ -11,6 +11,7 @@ void parisc_terminate(char *msg, struct pt_regs *regs,
 void die_if_kernel(char *str, struct pt_regs *regs, long err);
 
 /* mm/fault.c */
+const char *trap_name(unsigned long code);
 void do_page_fault(struct pt_regs *regs, unsigned long code,
                 unsigned long address);
 #endif
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 97d6b208e129..378df9207406 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -458,8 +458,8 @@ void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long o
         }
 
         printk("\n");
-        printk(KERN_CRIT "%s: Code=%d regs=%p (Addr=" RFMT ")\n",
-                        msg, code, regs, offset);
+        pr_crit("%s: Code=%d (%s) regs=%p (Addr=" RFMT ")\n",
+                msg, code, trap_name(code), regs, offset);
         show_regs(regs);
 
         spin_unlock(&terminate_lock);
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index b37787dbe775..3d6ef1b29c6a 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -90,8 +90,9 @@ SECTIONS
         /* Start of data section */
         _sdata = .;
 
-        RO_DATA_SECTION(8)
-
+        /* Architecturally we need to keep __gp below 0x1000000 and thus
+         * in front of RO_DATA_SECTION() which stores lots of tracepoint
+         * and ftrace symbols. */
 #ifdef CONFIG_64BIT
         . = ALIGN(16);
         /* Linkage tables */
@@ -106,6 +107,12 @@ SECTIONS
         }
 #endif
 
+        RO_DATA_SECTION(8)
+
+        /* RO because of BUILDTIME_EXTABLE_SORT */
+        EXCEPTION_TABLE(8)
+        NOTES
+
         /* unwind info */
         .PARISC.unwind : {
                 __start___unwind = .;
@@ -121,9 +128,6 @@ SECTIONS
         . = ALIGN(HUGEPAGE_SIZE);
         data_start = .;
 
-        EXCEPTION_TABLE(8)
-        NOTES
-
         /* Data */
         RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE)
 
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 47a6ca4c9e40..8ff9253930af 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -14,7 +14,7 @@
 #include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/extable.h>
 #include <linux/uaccess.h>
 
 #include <asm/traps.h>
@@ -204,6 +204,16 @@ static const char * const trap_description[] = {
         [28] "Unaligned data reference trap",
 };
 
+const char *trap_name(unsigned long code)
+{
+        const char *t = NULL;
+
+        if (code < ARRAY_SIZE(trap_description))
+                t = trap_description[code];
+
+        return t ? t : "Unknown trap";
+}
+
 /*
  * Print out info about fatal segfaults, if the show_unhandled_signals
  * sysctl is set:
@@ -213,8 +223,6 @@ show_signal_msg(struct pt_regs *regs, unsigned long code,
                 unsigned long address, struct task_struct *tsk,
                 struct vm_area_struct *vma)
 {
-        const char *trap_name = NULL;
-
         if (!unhandled_signal(tsk, SIGSEGV))
                 return;
 
@@ -226,10 +234,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long code,
             tsk->comm, code, address);
         print_vma_addr(KERN_CONT " in ", regs->iaoq[0]);
 
-        if (code < ARRAY_SIZE(trap_description))
-                trap_name = trap_description[code];
-        pr_warn(KERN_CONT " trap #%lu: %s%c", code,
-                trap_name ? trap_name : "unknown",
+        pr_cont(" trap #%lu: %s%c", code, trap_name(code),
                 vma ? ',':'\n');
 
         if (vma)
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 356f38473b5d..e02ada312be8 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -105,6 +105,8 @@ static void * __init get_memblock(unsigned long size)
         else
                 panic("get_memblock() failed.\n");
 
+        memset(__va(phys), 0, size);
+
         return __va(phys);
 }