From 96d04cae0c654dc4ebd18d7e040964e6e558c115 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Tue, 16 May 2006 11:29:46 +0100
Subject: [PATCH] --- yaml --- r: 26745 b: refs/heads/master c:
 1d6760a3ac6b5691e4914a3333b48fee5c2e275d h: refs/heads/master i:   26743:
 a8a5c6afb6f52eaa9b9a04672147a87b2ba4d306 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/lib/backtrace.S | 4 ++--
 trunk/arch/arm/lib/div64.S     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 303a5be36e42..db0e5c9644f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ceec0c8c6e2780d58dece91b4b787729405d9e7
+refs/heads/master: 1d6760a3ac6b5691e4914a3333b48fee5c2e275d
diff --git a/trunk/arch/arm/lib/backtrace.S b/trunk/arch/arm/lib/backtrace.S
index 3bdc8c6949c5..16153c86c3f8 100644
--- a/trunk/arch/arm/lib/backtrace.S
+++ b/trunk/arch/arm/lib/backtrace.S
@@ -122,7 +122,7 @@ ENTRY(c_backtrace)
 #define reg   r5
 #define stack r6
 
-.Ldumpstm:	stmfd	sp!, {instr, reg, stack, r7, lr}
+.Ldumpstm:	stmfd	sp!, {instr, reg, stack, r7, r8, lr}
 		mov	stack, r0
 		mov	instr, r1
 		mov	reg, #9
@@ -145,7 +145,7 @@ ENTRY(c_backtrace)
 		adrne	r0, .Lcr
 		blne	printk
 		mov	r0, stack
-		LOADREGS(fd, sp!, {instr, reg, stack, r7, pc})
+		LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc})
 
 .Lfp:		.asciz	" r%d = %08X%c"
 .Lcr:		.asciz	"\n"
diff --git a/trunk/arch/arm/lib/div64.S b/trunk/arch/arm/lib/div64.S
index ec9a1cd6176f..58eef6607629 100644
--- a/trunk/arch/arm/lib/div64.S
+++ b/trunk/arch/arm/lib/div64.S
@@ -189,12 +189,12 @@ ENTRY(__do_div64)
 	moveq	pc, lr
 
 	@ Division by 0:
-	str	lr, [sp, #-4]!
+	str	lr, [sp, #-8]!
 	bl	__div0
 
 	@ as wrong as it could be...
 	mov	yl, #0
 	mov	yh, #0
 	mov	xh, #0
-	ldr	pc, [sp], #4
+	ldr	pc, [sp], #8