Merge with Linux 2.4.3.

Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps.  This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.

4 files changed, 14 insertions, 14 deletions

diff --git a/arch/cris/drivers/serial.c b/arch/cris/drivers/serial.c
index 2dcb17a5e..feda9a0e0 100644
--- a/arch/cris/drivers/serial.c
+++ b/arch/cris/drivers/serial.c
@@ -146,7 +146,7 @@
  *
  * Revision 1.24  2000/02/09 18:02:28  bjornw
  * * Clear serial errors (overrun, framing, parity) correctly. Before, the
- *   receiver would get stuck if an error occured and we did not restart
+ *   receiver would get stuck if an error occurred and we did not restart
  *   the input DMA.
  * * Cosmetics (indentation, some code made into inlines)
  * * Some more debug options
@@ -1371,7 +1371,7 @@ ser_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			} 
 			else { /* it was a valid byte, now let the dma do the rest */
 #ifdef SERIAL_DEBUG_INTR
-				printk("** OK, disabling ser_interupts\n");
+				printk("** OK, disabling ser_interrupts\n");
 #endif
 				e100_disable_serial_data_irq(info);
 			}
diff --git a/arch/cris/kernel/entry.S b/arch/cris/kernel/entry.S
index 1af62eb2c..65a70922e 100644
--- a/arch/cris/kernel/entry.S
+++ b/arch/cris/kernel/entry.S
@@ -23,7 +23,7 @@
  *  Revision 1.8  2000/11/17 16:53:35  bjornw
  *  Added detection of frame-type in Rexit, so that mmu_bus_fault can
  *  use ret_from_intr in the return-path to check for signals (like SEGV)
- *  and other foul things that might have occured during the fault.
+ *  and other foul things that might have occurred during the fault.
  *
  *  Revision 1.7  2000/10/06 15:04:28  bjornw
  *  Include mof in register savings
diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c
index cfcb097f9..94ef1c698 100644
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
@@ -62,9 +62,9 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,
         }
         
         flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        down(&current->mm->mmap_sem);
+        down_write(&current->mm->mmap_sem);
         ret = do_mmap(file, addr, len, prot, flags, offset);
-        up(&current->mm->mmap_sem);
+        up_write(&current->mm->mmap_sem);
         if (file)
                 fput(file);
  out:
@@ -87,9 +87,9 @@ do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
                         goto out;
         }
 
-        down(&current->mm->mmap_sem);
+        down_write(&current->mm->mmap_sem);
         error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up(&current->mm->mmap_sem);
+        up_write(&current->mm->mmap_sem);
 
         if (file)
                 fput(file);
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index a4bb237b4..b1493b2d2 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -146,7 +146,7 @@ handle_mmu_bus_fault(struct pt_regs *regs)
  * routines.
  *
  * Notice that the address we're given is aligned to the page the fault
- * occured in, since we only get the PFN in R_MMU_CAUSE not the complete
+ * occurred in, since we only get the PFN in R_MMU_CAUSE not the complete
  * address.
  *
  * error_code:
@@ -212,7 +212,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 	if (in_interrupt() || !mm)
 		goto no_context;
 
-	down(&mm->mmap_sem);
+	down_read(&mm->mmap_sem);
 	vma = find_vma(mm, address);
 	if (!vma)
 		goto bad_area;
@@ -270,7 +270,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
                 goto out_of_memory;
 	}
 
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 	return;
 	
 	/*
@@ -280,7 +280,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 
  bad_area:
 
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 
  bad_area_nosemaphore:
 	DPG(show_registers(regs));
@@ -334,14 +334,14 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 	 */
 
  out_of_memory:
-        up(&mm->mmap_sem);
+        up_read(&mm->mmap_sem);
 	printk("VM: killing process %s\n", tsk->comm);
 	if(user_mode(regs))
 		do_exit(SIGKILL);
 	goto no_context;
 
  do_sigbus:
-	up(&mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 
 	/*
          * Send a sigbus, regardless of whether we were in kernel
@@ -381,7 +381,7 @@ vmalloc_fault:
                 pmd = pmd_offset(pgd, address);
                 pmd_k = pmd_offset(pgd_k, address);
 
-                if (pmd_present(*pmd) || !pmd_present(*pmd_k))
+                if (!pmd_present(*pmd_k))
                         goto bad_area_nosemaphore;
                 set_pmd(pmd, *pmd_k);
                 return;