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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
misc-embedded.c
diff --git
a/arch/ppc/boot/simple/misc-embedded.c
b/arch/ppc/boot/simple/misc-embedded.c
index
e13e7e4
..
58e2a92
100644
(file)
--- a/
arch/ppc/boot/simple/misc-embedded.c
+++ b/
arch/ppc/boot/simple/misc-embedded.c
@@
-83,7
+83,7
@@
load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *b
* initialize the serial console port.
*/
embed_config(&bp);
* initialize the serial console port.
*/
embed_config(&bp);
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_C
PM_C
ONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
com_port = serial_init(0, bp);
#endif
com_port = serial_init(0, bp);
#endif
@@
-260,7
+260,9
@@
load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *b
rec = (struct bi_record *)((unsigned long)rec + rec->size);
}
puts("Now booting the kernel\n");
rec = (struct bi_record *)((unsigned long)rec + rec->size);
}
puts("Now booting the kernel\n");
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
serial_close(com_port);
serial_close(com_port);
+#endif
return (unsigned long)hold_residual;
}
return (unsigned long)hold_residual;
}