diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 16:56:24 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:10 (GMT) |
| commit | d838f18f5efe70181901dbb2af1d1816875b7816 (patch) | |
| tree | 1984fdd8e1466e628317ddcdce954722b8848fe6 /mm | |
| parent | af64dcb7810696ec5d78aec2a09caeae2a1aa743 (diff) | |
| download | linux-fsl-qoriq-d838f18f5efe70181901dbb2af1d1816875b7816.tar.xz | |
filemap-fix-up.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Wrecked-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-m6yuzd6ul717hlnl2gj6p3ou@git.kernel.org
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 83efee7..cb81968 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1955,7 +1955,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page, char *kaddr; size_t copied; - BUG_ON(!in_atomic()); + BUG_ON(!pagefault_disabled()); kaddr = kmap_atomic(page); if (likely(i->nr_segs == 1)) { int left; |