diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-17 18:56:24 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-01 16:06:12 -0500 |
| commit | 841d19cfc220a6f5483089ff7e67876510213d84 (patch) | |
| tree | 0ac68bf95eff183816a4328e3c51d9191ec69930 /mm | |
| parent | 1afe8155d867150d15f464ba7a1cbfa7743fd201 (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 b7d860390f34..b75ac2cb1945 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2023,7 +2023,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; |