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 branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[pandora-kernel.git]
/
arch
/
mips
/
pmc-sierra
/
yosemite
/
prom.c
diff --git
a/arch/mips/pmc-sierra/yosemite/prom.c
b/arch/mips/pmc-sierra/yosemite/prom.c
index
0cd78f0
..
dcc926e
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/prom.c
+++ b/
arch/mips/pmc-sierra/yosemite/prom.c
@@
-19,6
+19,7
@@
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/reboot.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/reboot.h>
+#include <asm/smp-ops.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
#include <asm/pmon.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
#include <asm/pmon.h>
@@
-63,7
+64,7
@@
static void prom_exit(void)
#ifdef CONFIG_SMP
if (smp_processor_id())
/* CPU 1 */
#ifdef CONFIG_SMP
if (smp_processor_id())
/* CPU 1 */
- smp_call_function(prom_cpu0_exit, NULL, 1
, 1
);
+ smp_call_function(prom_cpu0_exit, NULL, 1);
#endif
prom_cpu0_exit(NULL);
}
#endif
prom_cpu0_exit(NULL);
}
@@
-78,6
+79,8
@@
static void prom_halt(void)
__asm__(".set\tmips3\n\t" "wait\n\t" ".set\tmips0");
}
__asm__(".set\tmips3\n\t" "wait\n\t" ".set\tmips0");
}
+extern struct plat_smp_ops yos_smp_ops;
+
/*
* Init routine which accepts the variables from PMON
*/
/*
* Init routine which accepts the variables from PMON
*/
@@
-99,7
+102,7
@@
void __init prom_init(void)
/* Get the boot parameters */
for (i = 1; i < argc; i++) {
/* Get the boot parameters */
for (i = 1; i < argc; i++) {
- if (strlen(arcs_cmdline) + strlen(arg[i]
+ 1)
>=
+ if (strlen(arcs_cmdline) + strlen(arg[i]
) + 1
>=
sizeof(arcs_cmdline))
break;
sizeof(arcs_cmdline))
break;
@@
-126,10
+129,9
@@
void __init prom_init(void)
env++;
}
env++;
}
- mips_machgroup = MACH_GROUP_TITAN;
- mips_machtype = MACH_TITAN_YOSEMITE;
-
prom_grab_secondary();
prom_grab_secondary();
+
+ register_smp_ops(&yos_smp_ops);
}
void __init prom_free_prom_memory(void)
}
void __init prom_free_prom_memory(void)