Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index 471d9779a7f47fcf9de7682c2aa7351be093b256..88f65f1558453359e854322ef0e881e3fd1efc89 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -382,7 +382,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
                        unsigned this_end = min_t(unsigned, end1, PAGE_SIZE);
 
                        if (end1 > start1) {
-                               kaddr = kmap_atomic(page + i);
+                               kaddr = kmap_local_page(page + i);
                                memset(kaddr + start1, 0, this_end - start1);
                        }
                        end1 -= this_end;
@@ -397,7 +397,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
 
                        if (end2 > start2) {
                                if (!kaddr)
-                                       kaddr = kmap_atomic(page + i);
+                                       kaddr = kmap_local_page(page + i);
                                memset(kaddr + start2, 0, this_end - start2);
                        }
                        end2 -= this_end;
@@ -405,7 +405,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
                }
 
                if (kaddr) {
-                       kunmap_atomic(kaddr);
+                       kunmap_local(kaddr);
                        flush_dcache_page(page + i);
                }