26 lines
822 B
Diff
26 lines
822 B
Diff
From e3b7c14a0064e0697ee6ef82be670fe442c662e0 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Fri, 17 Jun 2011 18:56:24 +0200
|
|
Subject: [PATCH 050/287] 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
|
|
---
|
|
mm/filemap.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mm/filemap.c b/mm/filemap.c
|
|
index 556858c..015f07e 100644
|
|
--- a/mm/filemap.c
|
|
+++ b/mm/filemap.c
|
|
@@ -2047,7 +2047,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;
|