diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-03-09 18:51:46 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-03-09 18:51:46 +0000 |
commit | 95f14d052a7439c60e35a6d910d6bd3de023907c (patch) | |
tree | 83b1039c3c9d0ff8d8b842d1ec5fc4a392a3a7d2 /target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c | |
parent | 85348d602e2c4b383fa0bec95fb97d9d79094743 (diff) | |
download | upstream-95f14d052a7439c60e35a6d910d6bd3de023907c.tar.gz upstream-95f14d052a7439c60e35a6d910d6bd3de023907c.tar.bz2 upstream-95f14d052a7439c60e35a6d910d6bd3de023907c.zip |
cns3xxx: add linux 3.8 support and use it by default
SVN-Revision: 35908
Diffstat (limited to 'target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c')
-rw-r--r-- | target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c index 16ad562651..77ac97a20c 100644 --- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c +++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/platsmp.c @@ -49,12 +49,6 @@ struct cpu_cache_fns cpu_cache_save; #define SCU_CPU_STATUS 0x08 static void __iomem *scu_base; -/* - * control for which core is the next to come out of the secondary - * boot "holding pen" - */ -volatile int __cpuinitdata pen_release = -1; - static void __init cns3xxx_set_fiq_regs(void) { struct pt_regs FIQ_regs; @@ -108,7 +102,7 @@ static void __cpuinit write_pen_release(int val) static DEFINE_SPINLOCK(boot_lock); -void __cpuinit platform_secondary_init(unsigned int cpu) +static void __cpuinit cns3xxx_secondary_init(unsigned int cpu) { /* * if any interrupts are already enabled for the primary @@ -143,7 +137,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) spin_unlock(&boot_lock); } -int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) +static int __cpuinit cns3xxx_boot_secondary(unsigned int cpu, struct task_struct *idle) { unsigned long timeout; @@ -192,7 +186,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * Initialise the CPU possible map early - this describes the CPUs * which may be present or become present in the system. */ -void __init smp_init_cpus(void) +static void __init cns3xxx_smp_init_cpus(void) { unsigned int i, ncores; unsigned int status; @@ -214,7 +208,7 @@ void __init smp_init_cpus(void) set_smp_cross_call(gic_raise_softirq); } -void __init platform_smp_prepare_cpus(unsigned int max_cpus) +static void __init cns3xxx_smp_prepare_cpus(unsigned int max_cpus) { int i; @@ -348,3 +342,10 @@ void smp_dma_flush_range(const void *start, const void *end) } raw_local_irq_restore(flags); } + +struct smp_operations cns3xxx_smp_ops __initdata = { + .smp_init_cpus = cns3xxx_smp_init_cpus, + .smp_prepare_cpus = cns3xxx_smp_prepare_cpus, + .smp_secondary_init = cns3xxx_secondary_init, + .smp_boot_secondary = cns3xxx_boot_secondary, +}; |