Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1f60a5a authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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

[yoichi_yuasa@tripeaks.co.jp: build fix]
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 182e8e23

arch/mips/sgi-ip27/ip27-memory.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/swap.h>

#include <linux/bootmem.h>

#include <linux/pfn.h>

#include <linux/highmem.h>

#include <asm/page.h>

#include <asm/sections.h>

arch/um/kernel/mem.c

+2 −0
Original line number Diff line number Diff line
@@ -79,8 +79,10 @@ void mem_init(void) 


	/* this will put all low memory onto the freelists */

	totalram_pages = free_all_bootmem();

#ifdef CONFIG_HIGHMEM

	totalhigh_pages = highmem >> PAGE_SHIFT;

	totalram_pages += totalhigh_pages;

#endif

	num_physpages = totalram_pages;

	max_pfn = totalram_pages;

	printk(KERN_INFO "Memory: %luk available\n",

include/linux/highmem.h

+3 −0
Original line number Diff line number Diff line
@@ -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)

{

include/linux/swap.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

mm/highmem.c

+13 −0
Original line number Diff line number Diff line
@@ -46,6 +46,19 @@ static void *mempool_alloc_pages_isa(gfp_t gfp_mask, void *data) 
 */

#ifdef CONFIG_HIGHMEM



unsigned long totalhigh_pages __read_mostly;



unsigned int nr_free_highpages (void)

{

	pg_data_t *pgdat;

	unsigned int pages = 0;



	for_each_online_pgdat(pgdat)

		pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages;



	return pages;

}



static int pkmap_count[LAST_PKMAP];

static unsigned int last_pkmap_nr;

static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);