[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ARM: pm: arm920/926: fix number of registers saved
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2011-08-30 23:12:50
Message-ID: 201108302312.p7UNCnxt028548 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/1c0270cd3a7a66148c3f72cab8fffc650d196d1d
Commit:     1c0270cd3a7a66148c3f72cab8fffc650d196d1d
Parent:     6f354e5f40f433da98fab4103cd3a0aef1c18bde
Author:     Russell King <rmk+kernel@arm.linux.org.uk>
AuthorDate: Sat Aug 27 11:43:14 2011 +0100
Committer:  Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Sun Aug 28 10:39:54 2011 +0100

    ARM: pm: arm920/926: fix number of registers saved
    
    ARM920 and ARM926 save four registers, not three.  Fix the size of
    the suspend region required.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mm/proc-arm920.S |    2 +-
 arch/arm/mm/proc-arm926.S |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 92bd102..2e6849b 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -379,7 +379,7 @@ ENTRY(cpu_arm920_set_pte_ext)
 
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl	cpu_arm920_suspend_size
-.equ	cpu_arm920_suspend_size, 4 * 3
+.equ	cpu_arm920_suspend_size, 4 * 4
 #ifdef CONFIG_PM_SLEEP
 ENTRY(cpu_arm920_do_suspend)
 	stmfd	sp!, {r4 - r7, lr}
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 2bbcf05..cd8f79c 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -394,7 +394,7 @@ ENTRY(cpu_arm926_set_pte_ext)
 
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl	cpu_arm926_suspend_size
-.equ	cpu_arm926_suspend_size, 4 * 3
+.equ	cpu_arm926_suspend_size, 4 * 4
 #ifdef CONFIG_PM_SLEEP
 ENTRY(cpu_arm926_do_suspend)
 	stmfd	sp!, {r4 - r7, lr}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]