Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv22582
Modified Files:
fault.c init.c ioremap.c
Log Message:
Cleanup compilation errors.
Index: fault.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/fault.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fault.c 2001/09/06 23:40:41 1.12
+++ fault.c 2001/09/11 19:25:15 1.13
@@ -47,7 +47,7 @@
#define REASON_WRITE (1<<2)
#undef VAX_MM_DEBUG
-#define VAX_MM_DEBUG_USER_FAULTS
+#undef VAX_MM_DEBUG_USER_FAULTS
static void
do_page_fault(struct accvio_info *info, struct pt_regs *regs)
@@ -136,7 +136,7 @@
show_regs(regs);
show_cpu_regs();
printk("\nStack dump\n");
- hex_dump((void *)((regs->fp&~0xf)-64), 768);
+ hex_dump((void *)((regs->fp&~0xf), 512);
printk("do_page_fault: sending SIGSEGV\n");
#endif
Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/init.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- init.c 2001/09/02 20:50:16 1.17
+++ init.c 2001/09/11 19:25:15 1.18
@@ -53,8 +53,8 @@
pg0 = (pte_t *)SPT_BASE;
/* set up pmd */
- swapper_pg_dir[2].pmd = swapper_pm_dir;
- swapper_pg_dir[2].pmd2 = &swapper_pm_dir[1024];
+ swapper_pg_dir[2].pmd = (unsigned int)swapper_pm_dir;
+ swapper_pg_dir[2].pmd2 = (unsigned int)&swapper_pm_dir[1024];
/* FIXME: I _really_ dont like this flag. */
pmd_val(swapper_pm_dir[PGD_SPECIAL]) = (unsigned long)swapper_pg_dir | 0x1;
Index: ioremap.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/ioremap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ioremap.c 2001/05/19 12:03:00 1.5
+++ ioremap.c 2001/09/11 19:25:15 1.6
@@ -142,7 +142,7 @@
return;
}
- p = GET_HWSPTE_VIRT(addr);
+ p = (pte_t *)GET_HWSPTE_VIRT(addr);
if ((p < iomap_base) && (p >= (iomap_base + SPT_PTES_IOMAP))) {
printk("iounmap: virtual addr 0x%08lx not in IOMAP region\n",
|
