From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/7] ARM: exynos: remove incorrect BSYM usage
Date: Fri, 13 Jan 2012 14:24:55 +0000 [thread overview]
Message-ID: <20120113142455.GE2227@linaro.org> (raw)
In-Reply-To: <1326389476-11569-5-git-send-email-robherring2@gmail.com>
On Thu, Jan 12, 2012 at 11:31:13AM -0600, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> BSYM macro is only needed for assembly files and its usage in c files is
> wrong, so remove it. The linker will correctly set bit 0 for Thumb2
> kernels.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> Cc: Dave Martin <dave.martin@linaro.org>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Missing .align before label 1 (see my comment on the ux500 patch)
Cheers
---Dave
> ---
> arch/arm/mach-exynos/headsmp.S | 1 +
> arch/arm/mach-exynos/platsmp.c | 5 ++---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
> index 3cdeb36..b6a0ee2 100644
> --- a/arch/arm/mach-exynos/headsmp.S
> +++ b/arch/arm/mach-exynos/headsmp.S
> @@ -36,6 +36,7 @@ pen: ldr r7, [r6]
> * should now contain the SVC stack for this core
> */
> b secondary_startup
> +ENDPROC(exynos4_secondary_startup)
>
> 1: .long .
> .long pen_release
> diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
> index 60bc45e..683aec7 100644
> --- a/arch/arm/mach-exynos/platsmp.c
> +++ b/arch/arm/mach-exynos/platsmp.c
> @@ -24,7 +24,6 @@
> #include <asm/cacheflush.h>
> #include <asm/hardware/gic.h>
> #include <asm/smp_scu.h>
> -#include <asm/unified.h>
>
> #include <mach/hardware.h>
> #include <mach/regs-clock.h>
> @@ -137,7 +136,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
> while (time_before(jiffies, timeout)) {
> smp_rmb();
>
> - __raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),
> + __raw_writel(virt_to_phys(exynos4_secondary_startup),
> CPU1_BOOT_REG);
> gic_raise_softirq(cpumask_of(cpu), 1);
>
> @@ -192,6 +191,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
> * until it receives a soft interrupt, and then the
> * secondary CPU branches to this address.
> */
> - __raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),
> + __raw_writel(virt_to_phys(exynos4_secondary_startup),
> CPU1_BOOT_REG);
> }
> --
> 1.7.5.4
>
next prev parent reply other threads:[~2012-01-13 14:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 17:31 [PATCH v2 0/7] BSYM macro removal and secondary startup fixes Rob Herring
2012-01-12 17:31 ` [PATCH v2 1/7] ARM: versatile: Add missing ENDPROC to headsmp.S Rob Herring
2012-01-13 14:09 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 2/7] ARM: msm: " Rob Herring
2012-01-12 17:31 ` [PATCH v2 3/7] ARM: ux500: add " Rob Herring
2012-01-13 14:24 ` Dave Martin
2012-01-13 14:46 ` Rob Herring
2012-01-12 17:31 ` [PATCH v2 4/7] ARM: exynos: remove incorrect BSYM usage Rob Herring
2012-01-13 14:24 ` Dave Martin [this message]
2012-01-12 17:31 ` [PATCH v2 5/7] ARM: imx: " Rob Herring
2012-01-13 14:27 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 6/7] ARM: highbank: " Rob Herring
2012-01-13 14:29 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 7/7] ARM: make BSYM macro assembly only Rob Herring
2012-01-13 14:10 ` Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120113142455.GE2227@linaro.org \
--to=dave.martin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.