Index: arch/sparc64/include/context.h
===================================================================
--- arch/sparc64/include/context.h	(revision 113b98b12997190124a0b63dc77cf2738b7bcfb4)
+++ arch/sparc64/include/context.h	(revision d53aba3f4dda52ce531a927bc7056b7e457638fc)
@@ -56,17 +56,25 @@
 /*
  * Only save registers that must be preserved across
- * function calls and that are not saved in caller's
- * register window.
+ * function calls.
  */
 struct context {
-	__u64 o1;
-	__u64 o2;
-	__u64 o3;
-	__u64 o4;
-	__u64 o5;
 	__address sp;		/* %o6 */
 	__address pc;		/* %o7 */
+	__u64 i0;
+	__u64 i1;
+	__u64 i2;
+	__u64 i3;
+	__u64 i4;
+	__u64 i5;
 	__address fp;		/* %i6 */
 	__address i7;
+	__u64 l0;
+	__u64 l1;
+	__u64 l2;
+	__u64 l3;
+	__u64 l4;
+	__u64 l5;
+	__u64 l6;
+	__u64 l7;
 	ipl_t ipl;
 };
Index: arch/sparc64/include/context_offset.h
===================================================================
--- arch/sparc64/include/context_offset.h	(revision 113b98b12997190124a0b63dc77cf2738b7bcfb4)
+++ arch/sparc64/include/context_offset.h	(revision d53aba3f4dda52ce531a927bc7056b7e457638fc)
@@ -1,11 +1,20 @@
 /* This file is automatically generated by gencontext.c. */
 /* struct context */
-#define OFFSET_O1  0x0
-#define OFFSET_O2  0x8
-#define OFFSET_O3  0x10
-#define OFFSET_O4  0x18
-#define OFFSET_O5  0x20
-#define OFFSET_SP  0x28
-#define OFFSET_PC  0x30
-#define OFFSET_FP  0x38
-#define OFFSET_I7  0x40
+#define OFFSET_SP  0x0
+#define OFFSET_PC  0x8
+#define OFFSET_I0  0x10
+#define OFFSET_I1  0x18
+#define OFFSET_I2  0x20
+#define OFFSET_I3  0x28
+#define OFFSET_I4  0x30
+#define OFFSET_I5  0x38
+#define OFFSET_FP  0x40
+#define OFFSET_I7  0x48
+#define OFFSET_L0  0x50
+#define OFFSET_L1  0x58
+#define OFFSET_L2  0x60
+#define OFFSET_L3  0x68
+#define OFFSET_L4  0x70
+#define OFFSET_L5  0x78
+#define OFFSET_L6  0x80
+#define OFFSET_L7  0x88
Index: arch/sparc64/src/context.S
===================================================================
--- arch/sparc64/src/context.S	(revision 113b98b12997190124a0b63dc77cf2738b7bcfb4)
+++ arch/sparc64/src/context.S	(revision d53aba3f4dda52ce531a927bc7056b7e457638fc)
@@ -44,25 +44,43 @@
 
 .macro CONTEXT_STORE r
-	stx %o1, [\r + OFFSET_O1]
-	stx %o2, [\r + OFFSET_O2]
-	stx %o3, [\r + OFFSET_O3]
-	stx %o4, [\r + OFFSET_O4]
-	stx %o5, [\r + OFFSET_O5]
+	stx %sp, [\r + OFFSET_SP]
 	stx %o7, [\r + OFFSET_PC]
-	stx %sp, [\r + OFFSET_SP]
+	stx %i0, [\r + OFFSET_I0]
+	stx %i1, [\r + OFFSET_I1]
+	stx %i2, [\r + OFFSET_I2]
+	stx %i3, [\r + OFFSET_I3]
+	stx %i4, [\r + OFFSET_I4]
+	stx %i5, [\r + OFFSET_I5]
 	stx %fp, [\r + OFFSET_FP]
 	stx %i7, [\r + OFFSET_I7]
+	stx %l0, [\r + OFFSET_L0]
+	stx %l1, [\r + OFFSET_L1]
+	stx %l2, [\r + OFFSET_L2]
+	stx %l3, [\r + OFFSET_L3]
+	stx %l4, [\r + OFFSET_L4]
+	stx %l5, [\r + OFFSET_L5]
+	stx %l6, [\r + OFFSET_L6]
+	stx %l7, [\r + OFFSET_L7]
 .endm
 
 .macro CONTEXT_LOAD r
-	ldx [\r + OFFSET_O1], %o1
-	ldx [\r + OFFSET_O2], %o2
-	ldx [\r + OFFSET_O3], %o3
-	ldx [\r + OFFSET_O4], %o4
-	ldx [\r + OFFSET_O5], %o5
+	ldx [\r + OFFSET_SP], %sp
 	ldx [\r + OFFSET_PC], %o7
-	ldx [\r + OFFSET_SP], %sp
+	ldx [\r + OFFSET_I0], %i0
+	ldx [\r + OFFSET_I1], %i1
+	ldx [\r + OFFSET_I2], %i2
+	ldx [\r + OFFSET_I3], %i3
+	ldx [\r + OFFSET_I4], %i4
+	ldx [\r + OFFSET_I5], %i5
 	ldx [\r + OFFSET_FP], %fp
 	ldx [\r + OFFSET_I7], %i7
+	ldx [\r + OFFSET_L0], %l0
+	ldx [\r + OFFSET_L1], %l1
+	ldx [\r + OFFSET_L2], %l2
+	ldx [\r + OFFSET_L3], %l3
+	ldx [\r + OFFSET_L4], %l4
+	ldx [\r + OFFSET_L5], %l5
+	ldx [\r + OFFSET_L6], %l6
+	ldx [\r + OFFSET_L7], %l7
 .endm
 
Index: tools/sparc64/gencontext.c
===================================================================
--- tools/sparc64/gencontext.c	(revision 113b98b12997190124a0b63dc77cf2738b7bcfb4)
+++ tools/sparc64/gencontext.c	(revision d53aba3f4dda52ce531a927bc7056b7e457638fc)
@@ -28,12 +28,22 @@
 
 	fprintf(f,"/* struct context */\n");
-	fprintf(f,"#define OFFSET_O1  0x%x\n",((int)&pctx->o1) - (int )pctx);
-	fprintf(f,"#define OFFSET_O2  0x%x\n",((int)&pctx->o2) - (int )pctx);
-	fprintf(f,"#define OFFSET_O3  0x%x\n",((int)&pctx->o3) - (int )pctx);
-	fprintf(f,"#define OFFSET_O4  0x%x\n",((int)&pctx->o4) - (int )pctx);
-	fprintf(f,"#define OFFSET_O5  0x%x\n",((int)&pctx->o5) - (int )pctx);
 	fprintf(f,"#define OFFSET_SP  0x%x\n",((int)&pctx->sp) - (int )pctx);
 	fprintf(f,"#define OFFSET_PC  0x%x\n",((int)&pctx->pc) - (int )pctx);
+	fprintf(f,"#define OFFSET_I0  0x%x\n",((int)&pctx->i0) - (int )pctx);
+	fprintf(f,"#define OFFSET_I1  0x%x\n",((int)&pctx->i1) - (int )pctx);
+	fprintf(f,"#define OFFSET_I2  0x%x\n",((int)&pctx->i2) - (int )pctx);
+	fprintf(f,"#define OFFSET_I3  0x%x\n",((int)&pctx->i3) - (int )pctx);
+	fprintf(f,"#define OFFSET_I4  0x%x\n",((int)&pctx->i4) - (int )pctx);
+	fprintf(f,"#define OFFSET_I5  0x%x\n",((int)&pctx->i5) - (int )pctx);
 	fprintf(f,"#define OFFSET_FP  0x%x\n",((int)&pctx->fp) - (int )pctx);
+	fprintf(f,"#define OFFSET_I7  0x%x\n",((int)&pctx->i7) - (int )pctx);
+	fprintf(f,"#define OFFSET_L0  0x%x\n",((int)&pctx->l0) - (int )pctx);
+	fprintf(f,"#define OFFSET_L1  0x%x\n",((int)&pctx->l1) - (int )pctx);
+	fprintf(f,"#define OFFSET_L2  0x%x\n",((int)&pctx->l2) - (int )pctx);
+	fprintf(f,"#define OFFSET_L3  0x%x\n",((int)&pctx->l3) - (int )pctx);
+	fprintf(f,"#define OFFSET_L4  0x%x\n",((int)&pctx->l4) - (int )pctx);
+	fprintf(f,"#define OFFSET_L5  0x%x\n",((int)&pctx->l5) - (int )pctx);
+	fprintf(f,"#define OFFSET_L6  0x%x\n",((int)&pctx->l6) - (int )pctx);
+	fprintf(f,"#define OFFSET_L7  0x%x\n",((int)&pctx->l7) - (int )pctx);
 
 	fclose(f);