git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
setup.c
diff --git
a/arch/ppc/kernel/setup.c
b/arch/ppc/kernel/setup.c
index
376f736
..
57b70ae
100644
(file)
--- a/
arch/ppc/kernel/setup.c
+++ b/
arch/ppc/kernel/setup.c
@@
-418,7
+418,6
@@
platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
* are used for initrd_start and initrd_size,
* otherwise they contain 0xdeadbeef.
*/
* are used for initrd_start and initrd_size,
* otherwise they contain 0xdeadbeef.
*/
- cmd_line[0] = 0;
if (r3 >= 0x4000 && r3 < 0x800000 && r4 == 0) {
strlcpy(cmd_line, (char *)r3 + KERNELBASE,
sizeof(cmd_line));
if (r3 >= 0x4000 && r3 < 0x800000 && r4 == 0) {
strlcpy(cmd_line, (char *)r3 + KERNELBASE,
sizeof(cmd_line));
@@
-484,6
+483,9
@@
static int __init set_preferred_console(void)
char *name;
int offset;
char *name;
int offset;
+ if (of_stdout_device == NULL)
+ return -ENODEV;
+
/* The user has requested a console so this is already set up. */
if (strstr(saved_command_line, "console="))
return -EBUSY;
/* The user has requested a console so this is already set up. */
if (strstr(saved_command_line, "console="))
return -EBUSY;
@@
-744,6
+746,10
@@
void __init setup_arch(char **cmdline_p)
if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
#endif
if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
#endif
+#ifdef CONFIG_DUMMY_CONSOLE
+ conswitchp = &dummy_con;
+#endif
+
ppc_md.setup_arch();
if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
ppc_md.setup_arch();
if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);