From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.orglinux-omap@vger.kernel.orglinux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/7] ARM: pm: force non-zero return value from __cpu_suspend when aborting
Date: Mon, 19 Sep 2011 17:38:43 +0100 [thread overview]
Message-ID: <E1R5grj-0004xn-RB@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20110919163741.GE16591@n2100.arm.linux.org.uk>
Ensure that the return value from __cpu_suspend is non-zero when
aborting. Zero indicates a successful suspend occurred.
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/kernel/sleep.S | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index dc902f2..46a9f46 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -61,6 +61,8 @@ ENDPROC(__cpu_suspend)
cpu_suspend_abort:
ldmia sp!, {r1 - r3} @ pop v:p, virt SP, phys resume fn
+ teq r0, #0
+ moveq r0, #1 @ force non-zero value
mov sp, r2
ldmfd sp!, {r4 - r11, pc}
ENDPROC(cpu_suspend_abort)
--
1.7.4.4
next prev parent reply other threads:[~2011-09-19 16:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 16:37 [PATCH 0/7] Add L2 cache cleaning to generic CPU suspend Russell King - ARM Linux
2011-09-19 16:38 ` Russell King - ARM Linux [this message]
2011-09-19 16:39 ` [PATCH 2/7] ARM: pm: preallocate a page table for suspend/resume Russell King - ARM Linux
2011-09-19 16:39 ` [PATCH 3/7] ARM: pm: only use preallocated page table during resume Russell King - ARM Linux
2011-09-19 16:39 ` [PATCH 4/7] ARM: pm: no need to save/restore context ID register Russell King - ARM Linux
2011-09-19 16:40 ` [PATCH 5/7] ARM: pm: get rid of cpu_resume_turn_mmu_on Russell King - ARM Linux
2011-09-19 16:40 ` [PATCH 6/7] ARM: pm: convert some assembly to C Russell King - ARM Linux
2011-09-19 16:40 ` [PATCH 7/7] ARM: pm: add L2 cache cleaning for suspend Russell King - ARM Linux
2011-09-20 3:47 ` [PATCH 0/7] Add L2 cache cleaning to generic CPU suspend Shawn Guo
2011-09-20 7:46 ` Russell King - ARM Linux
2011-09-20 8:04 ` Shawn Guo
2011-09-20 10:44 ` Santosh
2011-09-20 11:45 ` Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1R5grj-0004xn-RB@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.orglinux-omap \
--cc=linux-omap@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox