summaryrefslogtreecommitdiffstats
path: root/arch/alpha/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha/mm')
-rw-r--r--arch/alpha/mm/fault.c5
-rw-r--r--arch/alpha/mm/init.c2
2 files changed, 4 insertions, 3 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)
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index e2142b63c..2cbe9bb0f 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -37,7 +37,7 @@ extern void die_if_kernel(char *,struct pt_regs *,long);
struct thread_struct original_pcb;
-#ifndef __SMP__
+#ifndef CONFIG_SMP
struct pgtable_cache_struct quicklists;
#endif