From 5aa1a399bda2465101a2f5a75df8286cb0bdbaef Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 27 Nov 2008 11:13:58 +0000 Subject: [PATCH] --- yaml --- r: 119446 b: refs/heads/master c: 487ff32082a9bd7489d8185cf7d7a2fdf18a22fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/highmem.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f0315f33fd96..98fdfedd34e3 100644 --- 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 index 7dcbc82f3b7b..13875ce9112a 100644 --- 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 /**