Index: arch/ia64/include/context.h
===================================================================
--- arch/ia64/include/context.h	(revision 6c4024f47186fe4d445d0f4e605a4197e5d7dbab)
+++ arch/ia64/include/context.h	(revision ba1b7393876be73f8db9af9e629c6d11144b223f)
@@ -63,8 +63,4 @@
 	__u64 ar_rnat;
 	__u64 ar_lc;
-	__u64 ar_ec;
-	__u64 ar_ccv;
-	__u64 ar_csd;
-	__u64 ar_ssd;
 
 	/*
@@ -72,34 +68,10 @@
 	 */
 	__u64 r1;
-	__u64 r2;
-	__u64 r3;
 	__u64 r4;
 	__u64 r5;
 	__u64 r6;
 	__u64 r7;
-	__u64 r8;
-	__u64 r9;
-	__u64 r10;
-	__u64 r11;
 	__u64 sp;		/* r12 */
 	__u64 r13;
-	__u64 r14;
-	__u64 r15;
-	__u64 r16;
-	__u64 r17;
-	__u64 r18;
-	__u64 r19;
-	__u64 r20;
-	__u64 r21;
-	__u64 r22;
-	__u64 r23;
-	__u64 r24;
-	__u64 r25;
-	__u64 r26;
-	__u64 r27;
-	__u64 r28;
-	__u64 r29;
-	__u64 r30;
-	__u64 r31;
 	
 	/*
@@ -112,6 +84,4 @@
 	__u64 b4;
 	__u64 b5;
-	__u64 b6;
-	__u64 b7;
 
 	/*
Index: arch/ia64/src/context.S
===================================================================
--- arch/ia64/src/context.S	(revision 6c4024f47186fe4d445d0f4e605a4197e5d7dbab)
+++ arch/ia64/src/context.S	(revision ba1b7393876be73f8db9af9e629c6d11144b223f)
@@ -33,5 +33,5 @@
 
 context_save:
-	alloc loc0 = ar.pfs, 1, 11, 0, 0
+	alloc loc0 = ar.pfs, 1, 8, 0, 0
 	mov loc1 = ar.unat	;;
 	/* loc2 */
@@ -59,8 +59,4 @@
 
 	mov loc6 = ar.lc
-	mov loc7 = ar.ec
-	mov loc8 = ar.ccv
-	mov loc9 = ar.csd
-	mov loc10 = ar.ssd
 	
 	/*
@@ -75,8 +71,4 @@
 	st8 [in0] = loc5, 8	;;	/* save ar.rnat */
 	st8 [in0] = loc6, 8	;;	/* save ar.lc */
-	st8 [in0] = loc7, 8	;;	/* save ar.ec */
-	st8 [in0] = loc8, 8	;;	/* save ar.ccv */
-	st8 [in0] = loc9, 8	;;	/* save ar.csd */
-	st8 [in0] = loc10, 8	;;	/* save ar.ssd */	
 	
 	/*
@@ -84,34 +76,10 @@
 	 */
 	st8.spill [in0] = r1, 8		;;
-	st8.spill [in0] = r2, 8		;;
-	st8.spill [in0] = r3, 8		;;
 	st8.spill [in0] = r4, 8		;;
 	st8.spill [in0] = r5, 8		;;
 	st8.spill [in0] = r6, 8		;;
 	st8.spill [in0] = r7, 8		;;
-	st8.spill [in0] = r8, 8		;;
-	st8.spill [in0] = r9, 8		;;
-	st8.spill [in0] = r10, 8	;;
-	st8.spill [in0] = r11, 8	;;
 	st8.spill [in0] = r12, 8	;;	/* save sp */
 	st8.spill [in0] = r13, 8	;;
-	st8.spill [in0] = r14, 8	;;
-	st8.spill [in0] = r15, 8	;;
-	st8.spill [in0] = r16, 8	;;
-	st8.spill [in0] = r17, 8	;;
-	st8.spill [in0] = r18, 8	;;
-	st8.spill [in0] = r19, 8	;;
-	st8.spill [in0] = r20, 8	;;
-	st8.spill [in0] = r21, 8	;;
-	st8.spill [in0] = r22, 8	;;
-	st8.spill [in0] = r23, 8	;;
-	st8.spill [in0] = r24, 8	;;
-	st8.spill [in0] = r25, 8	;;
-	st8.spill [in0] = r26, 8	;;
-	st8.spill [in0] = r27, 8	;;
-	st8.spill [in0] = r28, 8	;;
-	st8.spill [in0] = r29, 8	;;
-	st8.spill [in0] = r30, 8	;;
-	st8.spill [in0] = r31, 8	;;
 
 	mov loc3 = ar.unat		;;
@@ -133,8 +101,4 @@
 	mov loc7 = b5		;;
 	st8 [in0] = loc7, 8
-	mov loc8 = b6		;;
-	st8 [in0] = loc8, 8
-	mov loc9 = b7		;;
-	st8 [in0] = loc9, 8
 
 	/*
@@ -151,5 +115,5 @@
 
 context_restore:
-	alloc loc0 = ar.pfs, 1, 11, 0, 0	;;
+	alloc loc0 = ar.pfs, 1, 8, 0, 0	;;
 
 	ld8 loc0 = [in0], 8	;;	/* load ar.pfs */
@@ -160,8 +124,4 @@
 	ld8 loc5 = [in0], 8	;;	/* load ar.rnat */
 	ld8 loc6 = [in0], 8	;;	/* load ar.lc */
-	ld8 loc7 = [in0], 8	;;	/* load ar.ec */
-	ld8 loc8 = [in0], 8	;;	/* load ar.ccv */
-	ld8 loc9 = [in0], 8	;;	/* load ar.csd */
-	ld8 loc10 = [in0], 8	;;	/* load ar.ssd */
 	
 	.auto	
@@ -185,8 +145,4 @@
 	mov ar.unat = loc2	;;
 	mov ar.lc = loc6
-	mov ar.ec = loc7
-	mov ar.ccv = loc8
-	mov ar.csd = loc9
-	mov ar.ssd = loc10
 	
 	/*
@@ -194,34 +150,10 @@
 	 */
 	ld8.fill r1 = [in0], 8	;;
-	ld8.fill r2 = [in0], 8	;;
-	ld8.fill r3 = [in0], 8	;;
 	ld8.fill r4 = [in0], 8	;;
 	ld8.fill r5 = [in0], 8	;;
 	ld8.fill r6 = [in0], 8	;;
 	ld8.fill r7 = [in0], 8	;;
-	ld8.fill r8 = [in0], 8	;;
-	ld8.fill r9 = [in0], 8	;;
-	ld8.fill r10 = [in0], 8	;;
-	ld8.fill r11 = [in0], 8	;;
 	ld8.fill r12 = [in0], 8	;;	/* restore sp */
 	ld8.fill r13 = [in0], 8	;;
-	ld8.fill r14 = [in0], 8	;;
-	ld8.fill r15 = [in0], 8	;;
-	ld8.fill r16 = [in0], 8	;;
-	ld8.fill r17 = [in0], 8	;;
-	ld8.fill r18 = [in0], 8	;;
-	ld8.fill r19 = [in0], 8	;;
-	ld8.fill r20 = [in0], 8	;;
-	ld8.fill r21 = [in0], 8	;;
-	ld8.fill r22 = [in0], 8	;;
-	ld8.fill r23 = [in0], 8	;;
-	ld8.fill r24 = [in0], 8	;;
-	ld8.fill r25 = [in0], 8	;;
-	ld8.fill r26 = [in0], 8	;;
-	ld8.fill r27 = [in0], 8	;;
-	ld8.fill r28 = [in0], 8	;;
-	ld8.fill r29 = [in0], 8	;;
-	ld8.fill r30 = [in0], 8	;;
-	ld8.fill r31 = [in0], 8	;;
 
 	/* 
@@ -240,8 +172,4 @@
 	ld8 loc7 = [in0], 8	;;
 	mov b5 = loc7
-	ld8 loc8 = [in0], 8	;;
-	mov b6 = loc8
-	ld8 loc9 = [in0], 8	;;
-	mov b7 = loc9
 
 	/*
Index: arch/ia64/src/dummy.s
===================================================================
--- arch/ia64/src/dummy.s	(revision 6c4024f47186fe4d445d0f4e605a4197e5d7dbab)
+++ arch/ia64/src/dummy.s	(revision ba1b7393876be73f8db9af9e629c6d11144b223f)
@@ -45,5 +45,5 @@
 .global fpu_enable
 .global fpu_disable
-.gloabl fpu_init
+.global fpu_init
 
 before_thread_runs_arch: