diff options
| author | Christoph Lameter <[email protected]> | 2006-09-25 23:31:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2006-09-26 08:48:46 -0700 |
| commit | c1f60a5a419cc60aff27daffb150f5a3a3a79ef4 (patch) | |
| tree | 8ae176462d6f220cd744ae6c3454113eebda02a8 /include/linux | |
| parent | 182e8e237349e7b6354f45aee4780b6423fd6a50 (diff) | |
[PATCH] reduce MAX_NR_ZONES: move HIGHMEM counters into highmem.c/.h
Move totalhigh_pages and nr_free_highpages() into highmem.c/.h
Move the totalhigh_pages definition into highmem.c/.h. Move the
nr_free_highpages function into highmem.c
[[email protected]: build fix]
Signed-off-by: Christoph Lameter <[email protected]>
Signed-off-by: Yoichi Yuasa <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
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) /* 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) { 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 * /* linux/mm/page_alloc.c */ extern unsigned long totalram_pages; -extern unsigned long totalhigh_pages; extern unsigned long totalreserve_pages; extern long nr_swap_pages; extern unsigned int nr_free_pages(void); |