diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/highmem.h | 3 | ||||
-rw-r--r-- | include/linux/swap.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 42620e723abb..fd7d12daa94f 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h | |||
@@ -24,11 +24,14 @@ static inline void flush_kernel_dcache_page(struct page *page) | |||
24 | 24 | ||
25 | /* declarations for linux/mm/highmem.c */ | 25 | /* declarations for linux/mm/highmem.c */ |
26 | unsigned int nr_free_highpages(void); | 26 | unsigned int nr_free_highpages(void); |
27 | extern unsigned long totalhigh_pages; | ||
27 | 28 | ||
28 | #else /* CONFIG_HIGHMEM */ | 29 | #else /* CONFIG_HIGHMEM */ |
29 | 30 | ||
30 | static inline unsigned int nr_free_highpages(void) { return 0; } | 31 | static inline unsigned int nr_free_highpages(void) { return 0; } |
31 | 32 | ||
33 | #define totalhigh_pages 0 | ||
34 | |||
32 | #ifndef ARCH_HAS_KMAP | 35 | #ifndef ARCH_HAS_KMAP |
33 | static inline void *kmap(struct page *page) | 36 | static inline void *kmap(struct page *page) |
34 | { | 37 | { |
diff --git a/include/linux/swap.h b/include/linux/swap.h index 5e59184c9096..34a6bc3e6cf3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -162,7 +162,6 @@ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct * | |||
162 | 162 | ||
163 | /* linux/mm/page_alloc.c */ | 163 | /* linux/mm/page_alloc.c */ |
164 | extern unsigned long totalram_pages; | 164 | extern unsigned long totalram_pages; |
165 | extern unsigned long totalhigh_pages; | ||
166 | extern unsigned long totalreserve_pages; | 165 | extern unsigned long totalreserve_pages; |
167 | extern long nr_swap_pages; | 166 | extern long nr_swap_pages; |
168 | extern unsigned int nr_free_pages(void); | 167 | extern unsigned int nr_free_pages(void); |