Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/boot
In directory usw-pr-cvs1:/tmp/cvs-serv9090/vax/boot
Modified Files:
head.S
Added Files:
default_command_line
Log Message:
synch 2.4.15 commit 14
--- NEW FILE ---
root=/dev/nfs nfsroot=/tftpboot/vaxroot rw debug
Index: head.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/boot/head.S,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- head.S 16 Sep 2001 15:19:27 -0000 1.14
+++ head.S 9 Apr 2002 13:50:55 -0000 1.15
@@ -215,6 +215,7 @@
#
# swapper_pg_dir is actually a pgd_t. The spt is the third entry.
# see include/asm-vax/mm/pagelet.h for details of the pgd_t structure.
+# If you change the SPT, change the offsets in asm/pgtable.h.
#
# First find a suitable start position for the SPT. This must be
# longword aligned
@@ -224,7 +225,8 @@
addl3 $0x200, r9, r5 # R9 holds kernel end
bicl2 $0x1ff, r5 # R5 is R9 rounded up to page aligned
moval swapper_pg_dir, r0
- movl r5, 48(r0) # save address of base of system page table
+# This is (pgd_t)swapper_pg_dir[2].br
+ movl r5, ASM_SBR_OFFSET(r0) # save address of base of system page table
# Fill in the main part of the SPT (the entries that map physical
# memory)
@@ -273,8 +275,8 @@
blssu sparefill2
# system page table is setup. Save SPT length and zap processor registers
moval swapper_pg_dir, r0
- movl r7, 52(r0)
- mtpr 48(r0), $PR_SBR # set SBR
+ movl r7, ASM_SLR_OFFSET(r0)
+ mtpr ASM_SBR_OFFSET(r0), $PR_SBR # set SBR
mtpr r7, $PR_SLR # set SLR
# PCBB
# set up the process control block. Some machines need a valid PCB for
@@ -293,7 +295,7 @@
calls $0, VAX_start_mm # do that ole black magic
# made it
moval swapper_pg_dir, r0
- addl2 $PAGE_OFFSET, 48(r0) # fix up our reference to the system page tbl.
+ addl2 $PAGE_OFFSET, ASM_SBR_OFFSET(r0) # fix up our reference to the system page tbl.
addl2 $PAGE_OFFSET, iomap_base # ... and the IOMAP PTEs
addl2 $PAGE_OFFSET, vmallocmap_base # ... and the IOMAP PTEs
addl2 $PAGE_OFFSET, mv # fix up machine vector pointer
|
