diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 16:56:24 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:48 (GMT) |
| commit | 12e9e5534de7cf05c3d77fd15847e86cb5d0ff96 (patch) | |
| tree | a20d5f0e7c05def7cf28f3925251c99811847742 /mm | |
| parent | c44e1fd723978c930c147d96594b87a96efb89c5 (diff) | |
| download | linux-fsl-qoriq-12e9e5534de7cf05c3d77fd15847e86cb5d0ff96.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')
| -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; |