projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
[linux-block.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
smp.c
diff --git
a/arch/cris/arch-v32/kernel/smp.c
b/arch/cris/arch-v32/kernel/smp.c
index cdd12028de0c5254e1622b97a38e9d20e14c3095..fe8e6039db2a04aa3c133385322fe6573b7b2b11 100644
(file)
--- a/
arch/cris/arch-v32/kernel/smp.c
+++ b/
arch/cris/arch-v32/kernel/smp.c
@@
-197,7
+197,7
@@
int setup_profiling_timer(unsigned int multiplier)
*/
unsigned long cache_decay_ticks = 1;
-int __cpu
init __cpu
_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
smp_boot_one_cpu(cpu, tidle);
return cpu_online(cpu) ? 0 : -ENOSYS;