Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv18447/mm
Modified Files:
Makefile fault.c init.c
Log Message:
machine check fixes. separate pgalloc.h routines into arch/vax/mm/pgalloc.c
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 2001/03/04 23:44:43 1.3
+++ Makefile 2001/06/26 18:59:00 1.4
@@ -12,7 +12,7 @@
all: mm.o
O_TARGET := mm.o
-obj-y := init.o pgtable.o ioremap.o extable.o fault.o
+obj-y := init.o pgtable.o pgalloc.o ioremap.o extable.o fault.o
OX_OBJS :=
MX_OBJS :=
Index: fault.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/fault.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fault.c 2001/05/20 13:25:11 1.5
+++ fault.c 2001/06/26 18:59:00 1.6
@@ -45,6 +45,7 @@
#define REASON_PPTEREF (1<<1)
#define REASON_WRITE (1<<2)
+#undef VAX_MM_DEBUG
static void
do_page_fault(struct accvio_info *info, struct pt_regs *regs)
@@ -56,7 +57,9 @@
struct mm_struct *mm = NULL;
unsigned fixup;
+#if VAX_MM_DEBUG
printk("mmfault: fault at %8X\n", address);
+#endif
/* This check, and the mm != NULL checks later, will be removed
later, once we actually have a 'current' properly defined */
if (tsk != NULL) {
@@ -215,7 +218,9 @@
if (!active) {
/* active = 1;*/
do_page_fault(info, regs);
+#if VAX_MM_DEBUG
printk("finished fault\n");
+#endif
active = 0;
} else {
Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/init.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- init.c 2001/06/16 19:41:44 1.13
+++ init.c 2001/06/26 18:59:00 1.14
@@ -14,6 +14,8 @@
#include <asm/pgalloc.h>
#include <asm/rpb.h>
+#undef VAX_INIT_DEBUG
+
static unsigned long totalram_pages;
unsigned long max_pfn; /* number of 4k pfns */
@@ -148,9 +150,10 @@
S0pte = pte_offset(sys_pgd, page_physical_address);
/* S0pte = (pte_t *)((__pa(page) >> PAGELET_SHIFT)+sys_pgd->br);*/
-
- printk("remap: virt addr %p, pteval %8lX , S0pte %p, %8lX\n", page, pte_val(*page), S0pte, pte_val(*S0pte));
+#if VAX_INIT_DEBUG
+ printk("remap: virt addr %p, pteval %8lX , S0pte %p, %8lX\n", page, pte_val(*page), S0pte, pte_val(*S0pte));
+#endif
if (!pte_present(*S0pte))
{
unsigned long phy_addr;
|