From 42a23ca0e54f39d71e84539203189430aa1f1726 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 17 Jun 2011 18:56:24 +0200 Subject: filemap-fix-up.patch Cc: Peter Zijlstra Signed-off-by: Thomas Gleixner Link: http://lkml.kernel.org/n/tip-m6yuzd6ul717hlnl2gj6p3ou@git.kernel.org 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; -- cgit v0.10.2