diff options
| author | Russell King | 2015-06-12 21:18:59 +0100 |
|---|---|---|
| committer | Russell King | 2015-06-12 21:18:59 +0100 |
| commit | a9dd3865dd1bd996a7e6af808645b7e566ced009 (patch) | |
| tree | 4a11fe3663f1e7c375bb8d33af85d8b1ad5e5ad5 /arch/arm/mach-berlin/platsmp.c | |
| parent | 27a513ca8600e96790f9f3a3c3182da947e569d2 (diff) | |
| parent | 2678bb9fa137726a0b83dd61a9c1636543066755 (diff) | |
Merge branch 'for-arm-soc' into for-next
Diffstat (limited to 'arch/arm/mach-berlin/platsmp.c')
| -rw-r--r-- | arch/arm/mach-berlin/platsmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c index 702e7982015a..34a3753e7356 100644 --- a/arch/arm/mach-berlin/platsmp.c +++ b/arch/arm/mach-berlin/platsmp.c @@ -22,7 +22,6 @@ #define RESET_VECT 0x00 #define SW_RESET_ADDR 0x94 -extern void berlin_secondary_startup(void); extern u32 boot_inst; static void __iomem *cpu_ctrl; @@ -85,7 +84,7 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus) * Write the secondary startup address into the SW reset address * vector. This is used by boot_inst. */ - writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR); + writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR); iounmap(vectors_base); unmap_scu: |