diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 18:56:24 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-03-22 17:56:18 -0400 |
| commit | 222a3038c94a910fca86b64b59b89a584045475e (patch) | |
| tree | e9433a4c8af213f328a6217aa662ef1a78069848 /mm | |
| parent | 8e4798a7866db4bfc4e251d31cc42318b87b4e82 (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 384344575c37..d9f32ee67daa 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; |