diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/alpha/mm | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/mm')
| -rw-r--r-- | arch/alpha/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 8871529a34e2..8aa9db834c11 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c | |||
| @@ -108,7 +108,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, | |||
| 108 | 108 | ||
| 109 | /* If we're in an interrupt context, or have no user context, | 109 | /* If we're in an interrupt context, or have no user context, |
| 110 | we must not take the fault. */ | 110 | we must not take the fault. */ |
| 111 | if (!mm || in_interrupt()) | 111 | if (!mm || in_atomic()) |
| 112 | goto no_context; | 112 | goto no_context; |
| 113 | 113 | ||
| 114 | #ifdef CONFIG_ALPHA_LARGE_VMALLOC | 114 | #ifdef CONFIG_ALPHA_LARGE_VMALLOC |