OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a9dd386) | patch
ARM: fix new BSYM() usage introduced via for-arm-soc branch
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:19:35 +0000 (21:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:19:35 +0000 (21:19 +0100)
commit9ce93bdda7b71fd154986d36c0c1ccf0e7338e26
tree27f58b37f1e0784bcf8e46fb3f66df3c3b74fbc7tree | snapshot
parenta9dd3865dd1bd996a7e6af808645b7e566ced009commit | diff
ARM: fix new BSYM() usage introduced via for-arm-soc branch

Commit 32e55a777f83 ("ARM: 8389/1: Add cpu_resume_arm() for firmwares
that resume in ARM state") needed to introduce a new usage of BSYM()
to fix a problem with a previous patch.  This in turn causes a conflict
with the "bsym" branch which removes this symbol, replacing it with a
'badr' assembly macro.  Fix this up.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/sleep.S diff | blob | history
About OSDN
Find Software
Develop Software
Help