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/alpha/mm/fault.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/alpha/mm/fault.c')
| -rw-r--r-- | arch/alpha/mm/fault.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 3d9c8e75e..1639972db 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -4,6 +4,7 @@ * Copyright (C) 1995 Linus Torvalds */ +#include <linux/config.h> #include <linux/sched.h> #include <linux/kernel.h> #include <linux/mm.h> @@ -34,7 +35,7 @@ extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); * Force a new ASN for a task. */ -#ifndef __SMP__ +#ifndef CONFIG_SMP unsigned long last_asn = ASN_FIRST_VERSION; #endif @@ -139,7 +140,7 @@ good_area: * make sure we exit gracefully rather than endlessly redo * the fault. */ - fault = handle_mm_fault(current, vma, address, cause > 0); + fault = handle_mm_fault(mm, vma, address, cause > 0); up(&mm->mmap_sem); if (fault < 0) |