[LV-k25-commit] kernel-2.5/arch/vax/boot head.S,1.16,1.17

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30369/arch/vax/boot

Modified Files:
	head.S 
Log Message:
Make mv.pre_vm_init an optional pointer.  Also print a blank line at
start of boot output (KA42 and KA46 consoles leave the cursor 
immediately after -ESA0 when netbooting)


Index: head.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- head.S	29 Sep 2004 21:49:58 -0000	1.16
+++ head.S	4 Oct 2004 23:02:55 -0000	1.17
@@ -68,8 +68,8 @@
 	addl2 %r8, MV_PRE_VM_GETCHAR(%r10)
 	addl2 %r8, MV_CPU_TYPE_STR(%r10)
 
-	# pre_vm_init is called after we relocate
-	subl2 $PAGE_OFFSET, MV_PRE_VM_INIT(%r10)
+	calls $0, boot_crlf
+	calls $0, boot_crlf
 
 	# print the cpu type
 	calls $0, boot_print_cpu_id
@@ -168,7 +168,11 @@
 	movl boot_r11, %r11
 	movc3 $RPB_SIZE, (%r11), boot_rpb
 	movl mv, %r10
+	tstl MV_PRE_VM_INIT(%r10)
+	beql no_pre_vm_init
+	subl2 $PAGE_OFFSET, MV_PRE_VM_INIT(%r10)
 	calls $0, *MV_PRE_VM_INIT(%r10)
+no_pre_vm_init:
 
 	# set up the system page table for all of physical memory.
 	# for the i386, the first page only is setup. For us, as the