Commit 764a579f authored by Pawel Moll's avatar Pawel Moll Committed by Rob Herring

ARM: versatile: Add missing ENDPROC to headsmp.S

Once the ENDPROC is in place, BSYM() in not longer necessary
to get correct pointer to versatile_secondary_startup().
Tested-by: default avatarJon Medhurst <tixy@linaro.org>
Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
Acked-by: default avatarDave Martin <dave.martin@linaro.org>
parent 805a6af8
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/smp_scu.h> #include <asm/smp_scu.h>
#include <asm/unified.h>
#include <mach/board-eb.h> #include <mach/board-eb.h>
#include <mach/board-pb11mp.h> #include <mach/board-pb11mp.h>
...@@ -75,6 +74,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus) ...@@ -75,6 +74,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
* until it receives a soft interrupt, and then the * until it receives a soft interrupt, and then the
* secondary CPU branches to this address. * secondary CPU branches to this address.
*/ */
__raw_writel(BSYM(virt_to_phys(versatile_secondary_startup)), __raw_writel(virt_to_phys(versatile_secondary_startup),
__io_address(REALVIEW_SYS_FLAGSSET)); __io_address(REALVIEW_SYS_FLAGSSET));
} }
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/unified.h>
#include <mach/motherboard.h> #include <mach/motherboard.h>
#define V2M_PA_CS7 0x10000000 #define V2M_PA_CS7 0x10000000
...@@ -46,6 +44,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus) ...@@ -46,6 +44,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
* secondary CPU branches to this address. * secondary CPU branches to this address.
*/ */
writel(~0, MMIO_P2V(V2M_SYS_FLAGSCLR)); writel(~0, MMIO_P2V(V2M_SYS_FLAGSCLR));
writel(BSYM(virt_to_phys(versatile_secondary_startup)), writel(virt_to_phys(versatile_secondary_startup),
MMIO_P2V(V2M_SYS_FLAGSSET)); MMIO_P2V(V2M_SYS_FLAGSSET));
} }
...@@ -38,3 +38,4 @@ pen: ldr r7, [r6] ...@@ -38,3 +38,4 @@ pen: ldr r7, [r6]
.align .align
1: .long . 1: .long .
.long pen_release .long pen_release
ENDPROC(versatile_secondary_startup)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment