ARM: shmobile: fix sleep-r8a7740.S miscompiles
PATCH 1/1 ARM: shmobile: fix sleep-r8a7740.S miscompiles
The newly added sleep-r8a7740.S file in shmobile does not actually build because of renamed symbols.
---
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.
arch/arm/mach-shmobile/sleep-r8a7740.S +2 -2
@@ -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
PATCH 1/1 ARM: shmobile: fix sleep-r8a7740.S miscompiles
Quoted 6 lines · Arnd Bergmann
The newly added
sleep-r8a7740.Sfile in shmobile does not actually build because of renamed symbols.Signed-off-by Arnd Bergmann <[email protected]>Cc Bastian Hecht <[email protected]>Cc Simon Horman <[email protected]>
Quoted 6 lines
---
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.
Sure, will do.
I am traveling today so I may not be able to deal with this properly until tomorrow.
Quoted 22 lines
arch/arm/mach-shmobile/sleep-r8a7740.S +2
-2@@ -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
PATCH 1/1 ARM: shmobile: fix sleep-r8a7740.S miscompiles
Quoted 12 lines · Simon Horman
Quoted 11 lines · Arnd Bergmann
The newly added
sleep-r8a7740.Sfile in shmobile does not actually build because of renamed symbols.Signed-off-by Arnd Bergmann <[email protected]>Cc Bastian Hecht <[email protected]>Cc Simon Horman <[email protected]>---
Simon, please apply to whichever branch of yours has the broken commit, or fold this patch into Bastian's patch.
Quoted 6 lines
Quoted 1 line
linux-next doesn't build for me because of this, mainline is still fine.
Sure, will do.
I am traveling today so I may not be able to deal with this properly until tomorrow.
I have queued this up in the soc-r8a7740 branch, where the problem was added. I have pushed this branch along with a refreshed next branch. This change should appear in linux-next in the not to distant future.