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

Pull more parisc updates from Helge Deller:

 - fix boot failure of 64-bit kernel. It got broken by the unwind
   optimization commit in merge window.

 - fix 64-bit userspace support (static 64-bit applications only, e.g.
   we don't yet have 64-bit userspace support in glibc).

 - consolidate unwind initialization code.

 - add machine model description to stack trace.

* 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Add hardware description to stack traces
  parisc: Fix boot failure of 64-bit kernel
  parisc: Consolidate unwind initialization calls
  parisc: Update comments in syscall.S regarding wide userland
  parisc: Fix ptraced 64-bit applications to call 64-bit syscalls
  parisc: Restore possibility to execute 64-bit applications

12 files changed, 113 insertions, 137 deletions

diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
index f019d3ec0c1c..d00973aab7f1 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -235,6 +235,7 @@ typedef unsigned long elf_greg_t;
 #define SET_PERSONALITY(ex) \
 ({      \
         set_personality((current->personality & ~PER_MASK) | PER_LINUX); \
+        clear_thread_flag(TIF_32BIT); \
         current->thread.map_base = DEFAULT_MAP_BASE; \
         current->thread.task_size = DEFAULT_TASK_SIZE; \
  })
@@ -243,9 +244,11 @@ typedef unsigned long elf_greg_t;
 
 #define COMPAT_SET_PERSONALITY(ex) \
 ({      \
-        set_thread_flag(TIF_32BIT); \
-        current->thread.map_base = DEFAULT_MAP_BASE32; \
-        current->thread.task_size = DEFAULT_TASK_SIZE32; \
+        if ((ex).e_ident[EI_CLASS] == ELFCLASS32) { \
+                set_thread_flag(TIF_32BIT); \
+                current->thread.map_base = DEFAULT_MAP_BASE32; \
+                current->thread.task_size = DEFAULT_TASK_SIZE32; \
+        } else clear_thread_flag(TIF_32BIT); \
  })
 
 /*
diff --git a/arch/parisc/include/asm/linkage.h b/arch/parisc/include/asm/linkage.h
index 49f6f3d772cc..cd6fe4febead 100644
--- a/arch/parisc/include/asm/linkage.h
+++ b/arch/parisc/include/asm/linkage.h
@@ -22,15 +22,6 @@
 name:           ASM_NL\
         .export name
 
-#ifdef CONFIG_64BIT
-#define ENDPROC(name) \
-        END(name)
-#else
-#define ENDPROC(name) \
-        .type name, @function !\
-        END(name)
-#endif
-
 #define ENTRY_CFI(name, ...) \
         ENTRY(name)     ASM_NL\
         .proc           ASM_NL\
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index 2dbe5580a1a4..2bd5e695bdad 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -256,11 +256,7 @@ on downward growing arches, it looks like this:
  * it in here from the current->personality
  */
 
-#ifdef CONFIG_64BIT
-#define USER_WIDE_MODE  (!test_thread_flag(TIF_32BIT))
-#else
-#define USER_WIDE_MODE  0
-#endif
+#define USER_WIDE_MODE  (!is_32bit_task())
 
 #define start_thread(regs, new_pc, new_sp) do {         \
         elf_addr_t *sp = (elf_addr_t *)new_sp;          \
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h
index e00013248907..8ecc1f0c0483 100644
--- a/arch/parisc/include/asm/traps.h
+++ b/arch/parisc/include/asm/traps.h
@@ -2,7 +2,9 @@
 #ifndef __ASM_TRAPS_H
 #define __ASM_TRAPS_H
 
-#ifdef __KERNEL__
+#define PARISC_ITLB_TRAP        6 /* defined by architecture. Do not change. */
+
+#if !defined(__ASSEMBLY__)
 struct pt_regs;
 
 /* traps.c */
diff --git a/arch/parisc/include/asm/unwind.h b/arch/parisc/include/asm/unwind.h
index f133b7efbebb..9547e5261a8b 100644
--- a/arch/parisc/include/asm/unwind.h
+++ b/arch/parisc/include/asm/unwind.h
@@ -73,8 +73,10 @@ unwind_table_remove(struct unwind_table *table);
 
 void unwind_frame_init(struct unwind_frame_info *info, struct task_struct *t, 
                        struct pt_regs *regs);
-void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct task_struct *t);
-void unwind_frame_init_running(struct unwind_frame_info *info, struct pt_regs *regs);
+void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info,
+                        struct task_struct *t);
+void unwind_frame_init_task(struct unwind_frame_info *info,
+                        struct task_struct *task, struct pt_regs *regs);
 int unwind_once(struct unwind_frame_info *info);
 int unwind_to_user(struct unwind_frame_info *info);
 
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index c7508f5717fb..242c5ab65611 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -36,6 +36,7 @@
 #include <asm/signal.h>
 #include <asm/unistd.h>
 #include <asm/ldcw.h>
+#include <asm/traps.h>
 #include <asm/thread_info.h>
 
 #include <linux/linkage.h>
@@ -692,7 +693,7 @@ ENTRY(fault_vector_20)
         def              3
         extint           4
         def              5
-        itlb_20          6
+        itlb_20          PARISC_ITLB_TRAP
         def              7
         def              8
         def              9
@@ -735,7 +736,7 @@ ENTRY(fault_vector_11)
         def              3
         extint           4
         def              5
-        itlb_11          6
+        itlb_11          PARISC_ITLB_TRAP
         def              7
         def              8
         def              9
@@ -776,7 +777,7 @@ END(fault_vector_11)
          * copy_thread moved args into task save area.
          */
 
-ENTRY_CFI(ret_from_kernel_thread)
+ENTRY(ret_from_kernel_thread)
         /* Call schedule_tail first though */
         BL      schedule_tail, %r2
         nop
@@ -791,7 +792,7 @@ ENTRY_CFI(ret_from_kernel_thread)
         copy    %r31, %r2
         b       finish_child_return
         nop
-ENDPROC_CFI(ret_from_kernel_thread)
+END(ret_from_kernel_thread)
 
 
         /*
@@ -815,9 +816,8 @@ ENTRY_CFI(_switch_to)
         LDREG   TASK_THREAD_INFO(%r25), %r25
         bv      %r0(%r2)
         mtctl   %r25,%cr30
-ENDPROC_CFI(_switch_to)
 
-ENTRY_CFI(_switch_to_ret)
+ENTRY(_switch_to_ret)
         mtctl   %r0, %cr0               /* Needed for single stepping */
         callee_rest
         callee_rest_float
@@ -825,7 +825,7 @@ ENTRY_CFI(_switch_to_ret)
         LDREG   -RP_OFFSET(%r30), %r2
         bv      %r0(%r2)
         copy    %r26, %r28
-ENDPROC_CFI(_switch_to_ret)
+ENDPROC_CFI(_switch_to)
 
         /*
          * Common rfi return path for interruptions, kernel execve, and
@@ -886,14 +886,12 @@ ENTRY_CFI(syscall_exit_rfi)
         STREG   %r19,PT_SR5(%r16)
         STREG   %r19,PT_SR6(%r16)
         STREG   %r19,PT_SR7(%r16)
-ENDPROC_CFI(syscall_exit_rfi)