projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smp_call_function: get rid of the unused nonatomic/retry argument
[deliverable/linux.git]
/
arch
/
mips
/
sibyte
/
cfe
/
setup.c
diff --git
a/arch/mips/sibyte/cfe/setup.c
b/arch/mips/sibyte/cfe/setup.c
index dbd6e6fdd3f912f31aca0f07e4a67200fd5aff52..fd9604d5555ac64d731e6ce2c56da1b171af07f0 100644
(file)
--- a/
arch/mips/sibyte/cfe/setup.c
+++ b/
arch/mips/sibyte/cfe/setup.c
@@
-28,6
+28,7
@@
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/sibyte/board.h>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/sibyte/board.h>
+#include <asm/smp-ops.h>
#include <asm/fw/cfe/cfe_api.h>
#include <asm/fw/cfe/cfe_error.h>
#include <asm/fw/cfe/cfe_api.h>
#include <asm/fw/cfe/cfe_error.h>
@@
-73,7
+74,7
@@
static void __noreturn cfe_linux_exit(void *arg)
if (!reboot_smp) {
/* Get CPU 0 to do the cfe_exit */
reboot_smp = 1;
if (!reboot_smp) {
/* Get CPU 0 to do the cfe_exit */
reboot_smp = 1;
- smp_call_function(cfe_linux_exit, arg,
1,
0);
+ smp_call_function(cfe_linux_exit, arg, 0);
}
} else {
printk("Passing control back to CFE...\n");
}
} else {
printk("Passing control back to CFE...\n");
@@
-232,6
+233,9
@@
static int __init initrd_setup(char *str)
#endif
#endif
+extern struct plat_smp_ops sb_smp_ops;
+extern struct plat_smp_ops bcm1480_smp_ops;
+
/*
* prom_init is called just after the cpu type is determined, from setup_arch()
*/
/*
* prom_init is called just after the cpu type is determined, from setup_arch()
*/
@@
-297,9
+301,6
@@
void __init prom_init(void)
* command line
*/
strcpy(arcs_cmdline, "root=/dev/ram0 ");
* command line
*/
strcpy(arcs_cmdline, "root=/dev/ram0 ");
-#ifdef CONFIG_SIBYTE_PTSWARM
- strcat(arcs_cmdline, "console=ttyS0,115200 ");
-#endif
} else {
/* The loader should have set the command line */
/* too early for panic to do any good */
} else {
/* The loader should have set the command line */
/* too early for panic to do any good */
@@
-340,6
+341,13
@@
void __init prom_init(void)
arcs_cmdline[CL_SIZE-1] = 0;
prom_meminit();
arcs_cmdline[CL_SIZE-1] = 0;
prom_meminit();
+
+#if defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250)
+ register_smp_ops(&sb_smp_ops);
+#endif
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
+ register_smp_ops(&bcm1480_smp_ops);
+#endif
}
void __init prom_free_prom_memory(void)
}
void __init prom_free_prom_memory(void)
This page took
0.037698 seconds
and
5
git commands to generate.