Patchwork [09/18] ARM: imx: remove incorrect BSYM usage

login
register
mail settings
Submitter Ike Panhc
Date May 17, 2012, 6:45 a.m.
Message ID <1337237123-3599-1-git-send-email-ike.pan@canonical.com>
Download mbox | patch
Permalink /patch/159829/
State New
Headers show

Comments

Ike Panhc - May 17, 2012, 6:45 a.m.
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: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Dave Martin <dave.martin@linaro.org>
(cherry picked from commit 0a60cb14a58696100481674682eb07ffb2a8eac7)

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
 arch/arm/mach-imx/src.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c
index a8e3368..74a4b5d 100644
--- a/arch/arm/mach-imx/src.c
+++ b/arch/arm/mach-imx/src.c
@@ -15,7 +15,6 @@ 
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/smp.h>
-#include <asm/unified.h>
 
 #define SRC_SCR				0x000
 #define SRC_GPR1			0x020
@@ -42,7 +41,7 @@  void imx_enable_cpu(int cpu, bool enable)
 void imx_set_cpu_jump(int cpu, void *jump_addr)
 {
 	cpu = cpu_logical_map(cpu);
-	writel_relaxed(BSYM(virt_to_phys(jump_addr)),
+	writel_relaxed(virt_to_phys(jump_addr),
 		       src_base + SRC_GPR1 + cpu * 8);
 }