---

yaml --- r: 119446 b: refs/heads/master c: 487ff32 h: refs/heads/master v: v3
git-mirror · Nov 27, 2008 · 5aa1a39 · 5aa1a39
1 parent 230e7e0
commit 5aa1a39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6417a917b564106dcf2b8f42687f92ad94635ddd
+refs/heads/master: 487ff32082a9bd7489d8185cf7d7a2fdf18a22fa
diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h
@@ -63,12 +63,14 @@ static inline void *kmap_atomic(struct page *page, enum km_type idx)
 #endif /* CONFIG_HIGHMEM */
 
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
+#ifndef clear_user_highpage
 static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
 	void *addr = kmap_atomic(page, KM_USER0);
 	clear_user_page(addr, vaddr, page);
 	kunmap_atomic(addr, KM_USER0);
 }
+#endif
 
 #ifndef __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
 /**