]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5394bce) | 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)
commit12875348a1ff84843bc740698e64c16d15df00a7
tree27f58b37f1e0784bcf8e46fb3f66df3c3b74fbc7tree | snapshot
parent5394bcec6ad0556c08b277f0b2553d687fbcd6d1commit | diff
ARM: fix new BSYM() usage introduced via for-arm-soc branch

Commit 82cdb8291cb5 ("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
Linux Kernel Source Tree.