diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 09:06:21 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 09:16:04 +0200 |
| commit | 25468fe89f88c4ceeef94526e94ae0db176f6999 (patch) | |
| tree | d70a713525281276b5063c814413bb3141e6056c /arch/arm/mach-spear13xx/include | |
| parent | ARM: highbank: call highbank_pm_init from .init_machine (diff) | |
| parent | ARM: consolidate pen_release instead of having per platform definitions (diff) | |
| download | linux-25468fe89f88c4ceeef94526e94ae0db176f6999.tar.xz linux-25468fe89f88c4ceeef94526e94ae0db176f6999.zip | |
Merge branch 'multiplatform/smp_ops' into next/multiplatform
* multiplatform/smp_ops:
ARM: consolidate pen_release instead of having per platform definitions
ARM: smp: Make SMP operations mandatory
ARM: SoC: convert spear13xx to SMP operations
ARM: SoC: convert imx6q to SMP operations
ARM: SoC: convert highbank to SMP operations
ARM: SoC: convert shmobile SMP to SMP operations
ARM: SoC: convert ux500 to SMP operations
ARM: SoC: convert MSM to SMP operations
ARM: SoC: convert Exynos4 to SMP operations
ARM: SoC: convert Tegra to SMP operations
ARM: SoC: convert OMAP4 to SMP operations
ARM: SoC: convert VExpress/RealView to SMP operations
ARM: SoC: add per-platform SMP operations
Conflicts due to file moves or removals in:
arch/arm/mach-msm/board-msm8960.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to board file cleanup:
arch/arm/mach-tegra/board-paz00.c
Conflicts due to cpu hotplug addition:
arch/arm/mach-tegra/hotplug.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-spear13xx/include')
| -rw-r--r-- | arch/arm/mach-spear13xx/include/mach/generic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/generic.h b/arch/arm/mach-spear13xx/include/mach/generic.h index dac57fd0cdfd..c33f4d9361bd 100644 --- a/arch/arm/mach-spear13xx/include/mach/generic.h +++ b/arch/arm/mach-spear13xx/include/mach/generic.h @@ -33,6 +33,9 @@ void __init spear13xx_l2x0_init(void); bool dw_dma_filter(struct dma_chan *chan, void *slave); void spear_restart(char, const char *); void spear13xx_secondary_startup(void); +void __cpuinit spear13xx_cpu_die(unsigned int cpu); + +extern struct smp_operations spear13xx_smp_ops; #ifdef CONFIG_MACH_SPEAR1310 void __init spear1310_clk_init(void); |