Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv7433/arch/vax/mm
Modified Files:
init.c pgalloc.c
Log Message:
Merge with Linux 2.5.1.
Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/init.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- init.c 20 May 2002 00:33:34 -0000 1.4
+++ init.c 31 May 2002 01:58:38 -0000 1.5
@@ -53,7 +53,7 @@
pg0 = (pte_t *)SPT_BASE;
/* set up pmd */
- swapper_pg_dir[2].pmd = (unsigned int)swapper_pm_dir;
+ swapper_pg_dir[2].pmd = swapper_pm_dir;
/* FIXME: This is where the VMALLOC stuff from head.S should go */
Index: pgalloc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/pgalloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgalloc.c 20 May 2002 00:33:34 -0000 1.4
+++ pgalloc.c 31 May 2002 01:58:38 -0000 1.5
@@ -156,7 +156,7 @@
remap_and_clear_pte_page(s0addr, (pte_t *)pmd);
/* this is the pointer to our pmd table. */
- pgd->pmd=(unsigned long)s0addr;
+ pgd->pmd=s0addr;
/* this is a two page block of memory */
s0addr += (PAGE_SIZE/sizeof(pmd_t));
@@ -329,7 +329,7 @@
/* decide on the segment we are in */
pgd_segment=0;
- while ((pgdp[pgd_segment].pmd != (unsigned long)pmd_basep)&&(pgd_segment<4)) {
+ while ((pgdp[pgd_segment].pmd != pmd_basep)&&(pgd_segment<4)) {
pgd_segment++;
}
|
