diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-01-28 16:04:21 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-02-17 10:24:13 +0100 |
| commit | d2613f56ce0287211d70a86443a143cae1887911 (patch) | |
| tree | 3e9549682b0095dbb1b7ccfc7a8224a44f9a793d /arch | |
| parent | Linux 4.5-rc1 (diff) | |
| download | linux-d2613f56ce0287211d70a86443a143cae1887911.tar.xz linux-d2613f56ce0287211d70a86443a143cae1887911.zip | |
ARM: shmobile: Move shmobile_scu_base from .text to .bss
shmobile_scu_base is being written to, so it doesn't belong in the .text
section. Fix this by moving it from asm .text to C .bss, as it's no
longer used from asm code since commit 4f6da36f7edd5790 ("ARM: shmobile:
Remove old SCU boot code").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp-scu.S | 6 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp-scu.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index fa5248c52399..5e503d91ad70 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S @@ -38,9 +38,3 @@ ENTRY(shmobile_boot_scu) b secondary_startup ENDPROC(shmobile_boot_scu) - - .text - .align 2 - .globl shmobile_scu_base -shmobile_scu_base: - .space 4 diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c index 64663110ab6c..f2198c9c7435 100644 --- a/arch/arm/mach-shmobile/platsmp-scu.c +++ b/arch/arm/mach-shmobile/platsmp-scu.c @@ -17,6 +17,9 @@ #include <asm/smp_scu.h> #include "common.h" + +void __iomem *shmobile_scu_base; + static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb, unsigned long action, void *hcpu) { |