--- zfs-0.8.2/module/lua/setjmp/setjmp_arm.S.orig
+++ zfs-0.8.2/module/lua/setjmp/setjmp_arm.S
@@ -33,10 +33,11 @@
 
 #define	ENTRY(x) \
 	.text; \
+	.syntax unified; \
 	.align 2; \
 	.global x; \
 	.type x,#function; \
-	.code 32; \
+	.code 16; \
 x:
 
 #define	END(x) \
@@ -49,13 +50,15 @@ x:
  * setjump + longjmp
  */
 ENTRY(setjmp)
-	stmia	r0, {r4-r14}
+	mov	ip, sp
+	stmia	r0, {r4-r12,r14}
 	mov	r0, #0x00000000
 	RET
 END(setjmp)
 
 ENTRY(longjmp)
-	ldmia	r0, {r4-r14}
+	ldmia	r0, {r4-r12,r14}
+	mov	sp, ip
 	mov	r0, #0x00000001
 	RET
 END(longjmp)