diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/sparc/mm | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/mm/fault.c | 6 | ||||
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 440e4fc61..82bfaf6bf 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.36 2000/01/29 01:09:05 anton Exp $ +# $Id: Makefile,v 1.37 2000/03/31 04:06:22 davem Exp $ # Makefile for the linux Sparc-specific parts of the memory manager. # # Note! Dependencies are done automagically by 'make dep', which also diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index 909c46447..a2af935cb 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c @@ -1,4 +1,4 @@ -/* $Id: fault.c,v 1.114 2000/02/14 04:52:36 jj Exp $ +/* $Id: fault.c,v 1.115 2000/04/25 04:13:25 davem Exp $ * fault.c: Page fault handlers for the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -250,7 +250,7 @@ good_area: * the fault. */ { - int fault = handle_mm_fault(tsk, vma, address, write); + int fault = handle_mm_fault(mm, vma, address, write); if (fault < 0) goto out_of_memory; if (!fault) @@ -450,7 +450,7 @@ good_area: if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; } - if (!handle_mm_fault(current, vma, address, write)) + if (!handle_mm_fault(mm, vma, address, write)) goto do_sigbus; up(&mm->mmap_sem); return; diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 3c8b079c3..24fc68c5a 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1,4 +1,4 @@ -/* $Id: sun4c.c,v 1.190 2000/02/14 04:52:34 jj Exp $ +/* $Id: sun4c.c,v 1.191 2000/04/08 02:11:41 davem Exp $ * sun4c.c: Doing in software what should be done in hardware. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |