diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 18:56:24 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:20 -0500 |
| commit | f6c51ca2f407aed73e1ef7578dd40b679a7d96b7 (patch) | |
| tree | 320ac58b17ec0248c06b125de2ce044eca228a95 /mm | |
| parent | 5e61d67161406666a63908eee7a703e93ecf779f (diff) | |
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 79c4b2b0b14e..51c34c0ff973 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2036,7 +2036,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; |