From 78a7f83ba0b52325457f678432dd4aab4ce893f8 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 19 Jul 2012 17:49:22 +0100
Subject: [PATCH] --- yaml --- r: 321114 b: refs/heads/master c:
 c7aa00db074e4961b49277d7d0fc2f5367d914ca h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/kernel/entry-common.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 191574b122d9..bcae326d6b4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6628521784d1da3b7354c6b6e8499e19ab46a3d1
+refs/heads/master: c7aa00db074e4961b49277d7d0fc2f5367d914ca
diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S
index 2909bbcaa0d1..978eac57e04a 100644
--- a/trunk/arch/arm/kernel/entry-common.S
+++ b/trunk/arch/arm/kernel/entry-common.S
@@ -443,7 +443,8 @@ __sys_trace:
 	mov	scno, r0			@ syscall number (possibly new)
 	add	r1, sp, #S_R0 + S_OFF		@ pointer to regs
 	cmp	scno, #NR_syscalls		@ check upper syscall limit
-	ldmccia	r1, {r0 - r3}			@ have to reload r0 - r3
+	ldmccia	r1, {r0 - r6}			@ have to reload r0 - r6
+	stmccia	sp, {r4, r5}			@ and update the stack args
 	ldrcc	pc, [tbl, scno, lsl #2]		@ call sys_* routine
 	b	2b