diff options
| author | Mark Brown | 2013-08-22 12:09:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-08-22 12:09:03 +0200 |
| commit | 64393c6e647c8a791243063d282c787b46721be7 (patch) | |
| tree | 89ca12bd5d52e8df24d2bc13a36d30479a4e825d /arch/hexagon/kernel/smp.c | |
| parent | ASoC: fsl: Add S/PDIF CPU DAI driver (diff) | |
| parent | ASoC: core: Generic ac97 link reset functions (diff) | |
| download | kernel-qcow2-linux-64393c6e647c8a791243063d282c787b46721be7.tar.gz kernel-qcow2-linux-64393c6e647c8a791243063d282c787b46721be7.tar.xz kernel-qcow2-linux-64393c6e647c8a791243063d282c787b46721be7.zip | |
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl
Diffstat (limited to 'arch/hexagon/kernel/smp.c')
| -rw-r--r-- | arch/hexagon/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c index 0e364ca43198..9faaa940452b 100644 --- a/arch/hexagon/kernel/smp.c +++ b/arch/hexagon/kernel/smp.c @@ -146,7 +146,7 @@ void __init smp_prepare_boot_cpu(void) * to point to current thread info */ -void __cpuinit start_secondary(void) +void start_secondary(void) { unsigned int cpu; unsigned long thread_ptr; @@ -194,7 +194,7 @@ void __cpuinit start_secondary(void) * maintains control until "cpu_online(cpu)" is set. */ -int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle) +int __cpu_up(unsigned int cpu, struct task_struct *idle) { struct thread_info *thread = (struct thread_info *)idle->stack; void *stack_start; |