From 45ef7f9342373fee20a51e6a9cf88de35b56a7f3 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Mon, 25 Sep 2006 23:30:55 -0700 Subject: [PATCH] --- yaml --- r: 35563 b: refs/heads/master c: a6ca1b99ed434f3fb41bbed647ed36c0420501e5 h: refs/heads/master i: 35561: 25cac7efe7d6173975333ae47241ae9ca82f2276 35559: 84572bf047a090a428758564da1bbc0fa8736350 v: v3 --- [refs] | 2 +- trunk/include/linux/highmem.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b8afa119e3dc..fb6d059f236f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3998b9301d3d55be8373add22b6bc5e11c1d9b71 +refs/heads/master: a6ca1b99ed434f3fb41bbed647ed36c0420501e5 diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h index 85ce7ef9a512..42620e723abb 100644 --- a/trunk/include/linux/highmem.h +++ b/trunk/include/linux/highmem.h @@ -29,6 +29,7 @@ unsigned int nr_free_highpages(void); static inline unsigned int nr_free_highpages(void) { return 0; } +#ifndef ARCH_HAS_KMAP static inline void *kmap(struct page *page) { might_sleep(); @@ -41,6 +42,7 @@ static inline void *kmap(struct page *page) #define kunmap_atomic(addr, idx) do { } while (0) #define kmap_atomic_pfn(pfn, idx) page_address(pfn_to_page(pfn)) #define kmap_atomic_to_page(ptr) virt_to_page(ptr) +#endif #endif /* CONFIG_HIGHMEM */