linux-vax-kern-commit

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/parisc/mm
In directory usw-pr-cvs1:/tmp/cvs-serv15874/parisc/mm

Modified Files:
	fault.c pa11.c pa20.c 
Log Message:
synch 2.4.15 commit 30


Index: fault.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/mm/fault.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fault.c	14 Jan 2001 19:57:07 -0000	1.1.1.1
+++ fault.c	9 Apr 2002 17:07:19 -0000	1.2
@@ -175,7 +175,7 @@
 	if (in_interrupt() || !mm)
 		goto no_context;
 
-	down(&mm->mmap_sem);
+	down_read(&mm->mmap_sem);
 	vma = pa_find_vma(mm, address);
 	if (!vma)
 		goto bad_area;
@@ -218,14 +218,14 @@
 	      default:
 		goto out_of_memory;
 	}
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 	return;
 
 /*
  * Something tried to access memory that isn't in our memory map..
  */
 bad_area:
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 
 	if (user_mode(regs)) {
 		struct siginfo si;
@@ -275,7 +275,7 @@
 	parisc_terminate("Bad Address (null pointer deref?)",regs,code,address);
 
   out_of_memory:
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 	printk("VM: killing process %s\n", current->comm);
 	if (user_mode(regs))
 		do_exit(SIGKILL);

Index: pa11.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/mm/pa11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pa11.c	14 Jan 2001 19:57:10 -0000	1.1.1.1
+++ pa11.c	9 Apr 2002 17:07:19 -0000	1.2
@@ -127,8 +127,9 @@
 	/*
 	 * Saved cp0 registers
 	 */
-	printk("epc  : %08lx\nStatus: %08x\nCause : %08x\n",
-	       (unsigned long) regs->cp0_epc, (unsigned int) regs->cp0_status,
+	printk("epc  : %08lx    %s\nStatus: %08x\nCause : %08x\n",
+	       (unsigned long) regs->cp0_epc, print_tainted(),
+	       (unsigned int) regs->cp0_status,
 	       (unsigned int) regs->cp0_cause);
 }
 

Index: pa20.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/mm/pa20.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pa20.c	14 Jan 2001 19:57:10 -0000	1.1.1.1
+++ pa20.c	9 Apr 2002 17:07:19 -0000	1.2
@@ -127,8 +127,9 @@
 	/*
 	 * Saved cp0 registers
 	 */
-	printk("epc  : %08lx\nStatus: %08x\nCause : %08x\n",
-	       (unsigned long) regs->cp0_epc, (unsigned int) regs->cp0_status,
+	printk("epc  : %08lx    %s\nStatus: %08x\nCause : %08x\n",
+	       (unsigned long) regs->cp0_epc, print_tainted(),
+	       (unsigned int) regs->cp0_status,
 	       (unsigned int) regs->cp0_cause);
 }