From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: fix sleep-r8a7740.S miscompiles
Date: Wed, 08 May 2013 12:18:04 +0000 [thread overview]
Message-ID: <201305081418.05091.arnd@arndb.de> (raw)
The newly added sleep-r8a7740.S file in shmobile does not
actually build because of renamed symbols.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Bastian Hecht <hechtb+renesas@gmail.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
---
Simon, please apply to whichever branch of yours has the broken commit,
or fold this patch into Bastian's patch.
linux-next doesn't build for me because of this, mainline is still fine.
diff --git a/arch/arm/mach-shmobile/sleep-r8a7740.S b/arch/arm/mach-shmobile/sleep-r8a7740.S
index 435531b..982eacb 100644
--- a/arch/arm/mach-shmobile/sleep-r8a7740.S
+++ b/arch/arm/mach-shmobile/sleep-r8a7740.S
@@ -32,7 +32,7 @@ ENTRY(r8a7740_shutdown)
wfi_loop:
bl cpu_v7_do_idle
b wfi_loop
-ENDPROC(r8a7740)
+ENDPROC(r8a7740_shutdown)
.text
ENTRY(v7_cpu_resume)
@@ -53,5 +53,5 @@ ENDPROC(v7_cpu_resume)
ENTRY(r8a7740_resume)
ldr pc, 1f
1: .long v7_cpu_resume - PAGE_OFFSET + PLAT_PHYS_OFFSET
-ENDPROC(r8a7740_resume_core_standby)
+ENDPROC(r8a7740_resume)
#endif
next reply other threads:[~2013-05-08 12:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-08 12:18 Arnd Bergmann [this message]
2013-05-09 3:25 ` [PATCH] ARM: shmobile: fix sleep-r8a7740.S miscompiles Simon Horman
2013-05-09 4:20 ` Simon Horman
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=201305081418.05091.arnd@arndb.de \
--to=arnd@arndb.de \
--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