Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Here we have two bug fixes:

  1) The current thread's fault_code is not setup properly upon entry to
     do_sparc64_fault() in some paths, leading to spurious SIGBUS.

  2) Don't use a zero length array at the end of thread_info on sparc64,
     otherwise end_of_stack() isn't right"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Do not define thread fpregs save area as zero-length array.
  sparc64: Fix corrupted thread fault code.

3 files changed, 8 insertions, 7 deletions

diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index f85dc8512ab3..cc6275c931a5 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -63,7 +63,8 @@ struct thread_info {
         struct pt_regs          *kern_una_regs;
         unsigned int            kern_una_insn;
 
-        unsigned long           fpregs[0] __attribute__ ((aligned(64)));
+        unsigned long           fpregs[(7 * 256) / sizeof(unsigned long)]
+                __attribute__ ((aligned(64)));
 };
 
 #endif /* !(__ASSEMBLY__) */
diff --git a/arch/sparc/kernel/dtlb_prot.S b/arch/sparc/kernel/dtlb_prot.S
index b2c2c5be281c..d668ca149e64 100644
--- a/arch/sparc/kernel/dtlb_prot.S
+++ b/arch/sparc/kernel/dtlb_prot.S
@@ -24,11 +24,11 @@
         mov             TLB_TAG_ACCESS, %g4             ! For reload of vaddr
 
 /* PROT ** ICACHE line 2: More real fault processing */
+        ldxa            [%g4] ASI_DMMU, %g5             ! Put tagaccess in %g5
         bgu,pn          %xcc, winfix_trampoline         ! Yes, perform winfixup
-         ldxa           [%g4] ASI_DMMU, %g5             ! Put tagaccess in %g5
-        ba,pt           %xcc, sparc64_realfault_common  ! Nope, normal fault
          mov            FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4
-        nop
+        ba,pt           %xcc, sparc64_realfault_common  ! Nope, normal fault
+         nop
         nop
         nop
         nop
diff --git a/arch/sparc/kernel/tsb.S b/arch/sparc/kernel/tsb.S
index 14158d40ba76..be98685c14c6 100644
--- a/arch/sparc/kernel/tsb.S
+++ b/arch/sparc/kernel/tsb.S
@@ -162,10 +162,10 @@ tsb_miss_page_table_walk_sun4v_fastpath:
         nop
         .previous
 
-        rdpr    %tl, %g3
-        cmp     %g3, 1
+        rdpr    %tl, %g7
+        cmp     %g7, 1
         bne,pn  %xcc, winfix_trampoline
-         nop
+         mov    %g3, %g4
         ba,pt   %xcc, etrap
          rd     %pc, %g7
         call    hugetlb_setup