diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 16:56:24 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:41 (GMT) |
commit | 42a23ca0e54f39d71e84539203189430aa1f1726 (patch) | |
tree | 1235801600010c6f33b91402f8aa97e1c42bcbc5 /mm/filemap.c | |
parent | 83c263774996f1c363f49a5dc211bbc98b18157d (diff) | |
download | linux-fsl-qoriq-42a23ca0e54f39d71e84539203189430aa1f1726.tar.xz |
filemap-fix-up.patch
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/n/tip-m6yuzd6ul717hlnl2gj6p3ou@git.kernel.org
Diffstat (limited to 'mm/filemap.c')
-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 ae4846f..3d2d39a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1976,7 +1976,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; |