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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  sparc: sunzilog uart order
  [SPARC64]: Detect trap frames in stack backtraces.
  [SPARC64]: %l6 trap return handling no longer necessary.
  [SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
  [SPARC64]: Store magic cookie and trap type in pt_regs.
  [SPARC64]: PROM debug console can be CON_ANYTIME.
  sparc64: cleanup after SunOS/Solaris binary emulation removal
  sparc: cleanup after SunOS binary emulation removal
  [SPARC64]: Add NUMA support.
  [SPARC64]: Allocate TSB node-local.
  [SPARC64]: NUMA device infrastructure.
  [SPARC64]: Kill pci_iommu_table_init() declaration.
  [SPARC64]: Once we have the boot cmdline, call parse_early_param()
  [SPARC64]: Remove unused asm-sparc64/numnodes.h
  [SPARC64]: Decrease SECTION_SIZE_BITS to 30.
  [SPARC64]: Initialize MDESC earlier and use lmb_alloc()
  [SPARC64]: Use lmb_alloc() for PROM device tree.
  [SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().
  [SPARC64]: Fully use LMB information in bootmem_init().
  [SPARC64]: Start using LMB information in bootmem_init().
  ...

1 files changed, 4 insertions, 17 deletions

diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index 079d18a11d24..ecf6753b204a 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -18,12 +18,6 @@
 #define         RTRAP_PSTATE_IRQOFF     (PSTATE_RMO|PSTATE_PEF|PSTATE_PRIV)
 #define         RTRAP_PSTATE_AG_IRQOFF  (PSTATE_RMO|PSTATE_PEF|PSTATE_PRIV|PSTATE_AG)
 
-                /* Register %l6 keeps track of whether we are returning
-                 * from a system call or not.  It is cleared if we call
-                 * do_notify_resume, and it must not be otherwise modified
-                 * until we fully commit to returning to userspace.
-                 */
-
                 .text
                 .align                  32
 __handle_softirq:
@@ -56,14 +50,12 @@ __handle_user_windows:
                 be,pt                   %xcc, __handle_user_windows_continue
                  nop
                 mov                     %l5, %o1
-                mov                     %l6, %o2
                 add                     %sp, PTREGS_OFF, %o0
-                mov                     %l0, %o3
+                mov                     %l0, %o2
 
                 call                    do_notify_resume
                  wrpr                   %g0, RTRAP_PSTATE, %pstate
                 wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
-                clr                     %l6
                 /* Signal delivery can modify pt_regs tstate, so we must
                  * reload it.
                  */
@@ -99,14 +91,12 @@ __handle_perfctrs:
                 be,pt                   %xcc, __handle_perfctrs_continue
                  sethi                  %hi(TSTATE_PEF), %o0
                 mov                     %l5, %o1
-                mov                     %l6, %o2
                 add                     %sp, PTREGS_OFF, %o0
-                mov                     %l0, %o3
+                mov                     %l0, %o2
                 call                    do_notify_resume
 
                  wrpr                   %g0, RTRAP_PSTATE, %pstate
                 wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
-                clr                     %l6
                 /* Signal delivery can modify pt_regs tstate, so we must
                  * reload it.
                  */
@@ -127,13 +117,11 @@ __handle_userfpu:
 
 __handle_signal:
                 mov                     %l5, %o1
-                mov                     %l6, %o2
                 add                     %sp, PTREGS_OFF, %o0
-                mov                     %l0, %o3
+                mov                     %l0, %o2
                 call                    do_notify_resume
                  wrpr                   %g0, RTRAP_PSTATE, %pstate
                 wrpr                    %g0, RTRAP_PSTATE_IRQOFF, %pstate
-                clr                     %l6
 
                 /* Signal delivery can modify pt_regs tstate, so we must
                  * reload it.
@@ -145,9 +133,8 @@ __handle_signal:
                  andn                   %l1, %l4, %l1
 
                 .align                  64
-                .globl                  rtrap_irq, rtrap_clr_l6, rtrap, irqsz_patchme, rtrap_xcall
+                .globl                  rtrap_irq, rtrap, irqsz_patchme, rtrap_xcall
 rtrap_irq:
-rtrap_clr_l6:   clr                     %l6
 rtrap:
 #ifndef CONFIG_SMP
                 sethi                   %hi(per_cpu____cpu_data), %l0