projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
alpha
/
mm
/
fault.c
diff --git
a/arch/alpha/mm/fault.c
b/arch/alpha/mm/fault.c
index 8871529a34e2026e4f2bd4eda531df7ec59808a4..f5862792a167049b16f625552c2314c20c0681df 100644
(file)
--- a/
arch/alpha/mm/fault.c
+++ b/
arch/alpha/mm/fault.c
@@
-21,7
+21,6
@@
#include <linux/ptrace.h>
#include <linux/mman.h>
#include <linux/smp.h>
#include <linux/ptrace.h>
#include <linux/mman.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/module.h>
@@
-108,7
+107,7
@@
do_page_fault(unsigned long address, unsigned long mmcsr,
/* If we're in an interrupt context, or have no user context,
we must not take the fault. */
/* If we're in an interrupt context, or have no user context,
we must not take the fault. */
- if (!mm || in_
interrupt
())
+ if (!mm || in_
atomic
())
goto no_context;
#ifdef CONFIG_ALPHA_LARGE_VMALLOC
goto no_context;
#ifdef CONFIG_ALPHA_LARGE_VMALLOC