diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 14:14:13 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 14:14:13 +0100 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /arch/arm/mach-integrator/platsmp.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
| download | kernel_samsung_smdk4412-c5fbc3966f48279dbebfde10248c977014aa9988.zip kernel_samsung_smdk4412-c5fbc3966f48279dbebfde10248c977014aa9988.tar.gz kernel_samsung_smdk4412-c5fbc3966f48279dbebfde10248c977014aa9988.tar.bz2 | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/arm/mach-integrator/platsmp.c')
| -rw-r--r-- | arch/arm/mach-integrator/platsmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c index 2ba0257..aecf47b 100644 --- a/arch/arm/mach-integrator/platsmp.c +++ b/arch/arm/mach-integrator/platsmp.c @@ -27,12 +27,12 @@ extern void integrator_secondary_startup(void); * control for which core is the next to come out of the secondary * boot "holding pen" */ -volatile int __initdata pen_release = -1; -unsigned long __initdata phys_pen_release = 0; +volatile int __cpuinitdata pen_release = -1; +unsigned long __cpuinitdata phys_pen_release = 0; static DEFINE_SPINLOCK(boot_lock); -void __init platform_secondary_init(unsigned int cpu) +void __cpuinit platform_secondary_init(unsigned int cpu) { /* * the primary core may have used a "cross call" soft interrupt @@ -61,7 +61,7 @@ void __init platform_secondary_init(unsigned int cpu) spin_unlock(&boot_lock); } -int __init boot_secondary(unsigned int cpu, struct task_struct *idle) +int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) { unsigned long timeout; |