git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
smp.c
diff --git
a/arch/mips/kernel/smp.c
b/arch/mips/kernel/smp.c
index
f2a8701
..
0555fc5
100644
(file)
--- a/
arch/mips/kernel/smp.c
+++ b/
arch/mips/kernel/smp.c
@@
-271,7
+271,7
@@
void __devinit smp_prepare_boot_cpu(void)
* and keep control until "cpu_online(cpu)" is set. Note: cpu is
* physical, not logical.
*/
-int __
dev
init __cpu_up(unsigned int cpu)
+int __
cpu
init __cpu_up(unsigned int cpu)
{
struct task_struct *idle;