diff options
author | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:06 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:06 -0800 |
commit | 8b0f6d12de91345190f234edba781b2fd03257b6 (patch) | |
tree | 4b6015433a0ffe5fc7ff9115014e3da580581f4b /arch/arm/mach-imx/src.c | |
parent | 916e5ebb9f5a154bb845d555a1a84ef48411b73a (diff) | |
parent | efb963dcd9854c70667cdba9b5854b7290f1cefd (diff) | |
download | linux-8b0f6d12de91345190f234edba781b2fd03257b6.tar.bz2 |
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
* 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux:
ARM: make BSYM macro assembly only
ARM: highbank: remove incorrect BSYM usage
ARM: imx: remove incorrect BSYM usage
ARM: exynos: remove incorrect BSYM usage
ARM: ux500: add missing ENDPROC to headsmp.S
ARM: msm: Add missing ENDPROC to headsmp.S
ARM: versatile: Add missing ENDPROC to headsmp.S
Diffstat (limited to 'arch/arm/mach-imx/src.c')
-rw-r--r-- | arch/arm/mach-imx/src.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index 4bde04f99e38..29bd1243781e 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 @@ -43,7 +42,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); } |