Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv5909
Modified Files:
cpu_ka650.c
Log Message:
DA: backport IPR console support from 2.5
Index: cpu_ka650.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka650.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpu_ka650.c 25 Apr 2002 08:46:20 -0000 1.4
+++ cpu_ka650.c 26 Oct 2002 10:50:05 -0000 1.5
@@ -54,6 +54,8 @@
unsigned int *ka650_cacr = (unsigned int *)0x20084000;
+extern void iprcons_serial_console_init(void);
+
void ka650_pre_vm_init(void)
{
mv_ka650.sidex = *(unsigned int *)CVAX_SIDEX_ADDR;
@@ -94,8 +96,10 @@
/* Writing to PR_CADR on the CVAX chip implicitly clears the level 1 cache */
__mtpr(KA650_CADR_S2E|KA650_CADR_S1E|KA650_CADR_ISE|KA650_CADR_DSE, PR_CADR);
-
- register_console(&vax_console);
+#if defined(CONFIG_SERIAL_IPR) && defined(CONFIG_SERIAL_CONSOLE)
+ iprcons_serial_console_init();
+#endif
+
printk("KA650 sidex = %08x\n", mv_ka650.sidex);
}
|
