X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fhighmem.h;h=fd7d12daa94ff3e0c066ccc789b6878739c9a022;hb=11faa658c668030759d4aea6a273b7ac9a0b4746;hp=892c4ea1b4254a63d6540f948229a6f8164282e1;hpb=5a3a5a98b6422d05c39eaa32c8b3f83840c7b768;p=powerpc.git

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 892c4ea1b4..fd7d12daa9 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_HIGHMEM_H
 #define _LINUX_HIGHMEM_H
 
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 
@@ -25,11 +24,15 @@ static inline void flush_kernel_dcache_page(struct page *page)
 
 /* declarations for linux/mm/highmem.c */
 unsigned int nr_free_highpages(void);
+extern unsigned long totalhigh_pages;
 
 #else /* CONFIG_HIGHMEM */
 
 static inline unsigned int nr_free_highpages(void) { return 0; }
 
+#define totalhigh_pages 0
+
+#ifndef ARCH_HAS_KMAP
 static inline void *kmap(struct page *page)
 {
 	might_sleep();
@@ -42,6 +45,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 */