From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: sh7372 build fix for SUSPEND=n && CPU_IDLE=n
Date: Mon, 17 Jun 2013 12:28:48 +0900 [thread overview]
Message-ID: <20130617032848.21337.29264.sendpatchset@w520> (raw)
From: Magnus Damm <damm@opensource.se>
Move the code using cpu_resume() into a function being
wrappend in #ifdef CONFIG_SUSPEND || CONFIG_CPU_IDLE.
This fixes a build error triggered by ap4evb_defconfig.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Applies to renesas-next-20130613
arch/arm/mach-shmobile/pm-sh7372.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- 0001/arch/arm/mach-shmobile/pm-sh7372.c
+++ work/arch/arm/mach-shmobile/pm-sh7372.c 2013-06-17 12:03:18.000000000 +0900
@@ -351,6 +351,9 @@ static void sh7372_enter_a4s_common(int
static void sh7372_pm_setup_smfram(void)
{
+ /* pass physical address of cpu_resume() to assembly resume code */
+ sh7372_cpu_resume = virt_to_phys(cpu_resume);
+
memcpy((void *)SMFRAM, sh7372_resume_core_standby_sysc, 0x100);
}
#else
@@ -524,9 +527,6 @@ void __init sh7372_pm_init(void)
/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */
__raw_writel(0, PDNSEL);
- /* pass physical address of cpu_resume() to assembly resume code */
- sh7372_cpu_resume = virt_to_phys(cpu_resume);
-
sh7372_pm_setup_smfram();
sh7372_suspend_init();
reply other threads:[~2013-06-17 3:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20130617032848.21337.29264.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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