| Message ID | 1453993462-12210-2-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 797eff54b22b76d9f356074ff3c7ed25d9742e54 |
| Delegated to: | Simon Horman |
| Headers | show |
Hello. On 01/28/2016 06:04 PM, Geert Uytterhoeven wrote: > 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 .data, 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> [...] > diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c > index 64663110ab6ca0e1..f2198c9c74359736 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" > > + Why add 2nd empty line? > +void __iomem *shmobile_scu_base; > + > static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb, > unsigned long action, void *hcpu) > { MBR, Sergei
On Thu, Jan 28, 2016 at 4:37 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: >> diff --git a/arch/arm/mach-shmobile/platsmp-scu.c >> b/arch/arm/mach-shmobile/platsmp-scu.c >> index 64663110ab6ca0e1..f2198c9c74359736 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" >> >> + > > Why add 2nd empty line? I always leave two blank lines between different sections, and one blank line between function or data blocks. Is that a problem? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index fa5248c52399c9b5..5e503d91ad70ddf2 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 64663110ab6ca0e1..f2198c9c74359736 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) {
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 .data, 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> --- arch/arm/mach-shmobile/headsmp-scu.S | 6 ------ arch/arm/mach-shmobile/platsmp-scu.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-)