diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 18:56:24 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:08 -0600 |
| commit | a8ff061b97309b3111de250a82101437ea30123e (patch) | |
| tree | f16b8dd57f75f16f7ede13c4930672c42463370c /mm | |
| parent | 07a652a228d24011300a028dd41e6c4e674f93c0 (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 5f0a3c91fdac..59ef26c94966 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2058,7 +2058,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, KM_USER0); if (likely(i->nr_segs == 1)) { int left; |