[PATCH] Drop free_pages()
nr_free_pages is now a simple access to a global variable. Make it a macro instead of a function. The nr_free_pages now requires vmstat.h to be included. There is one occurrence in power management where we need to add the include. Directly refrer to global_page_state() there to clarify why the #include was added. [akpm@osdl.org: arm build fix] [akpm@osdl.org: sparc64 build fix] Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
51ed449127
commit
9617729941
@@ -416,7 +416,7 @@ void show_mem(void)
|
||||
printk("Free swap: %6ldkB\n",
|
||||
nr_swap_pages << (PAGE_SHIFT-10));
|
||||
printk("%ld pages of RAM\n", num_physpages);
|
||||
printk("%d free pages\n", nr_free_pages());
|
||||
printk("%lu free pages\n", nr_free_pages());
|
||||
}
|
||||
|
||||
void mmu_info(struct seq_file *m)
|
||||
@@ -1593,7 +1593,7 @@ void __init mem_init(void)
|
||||
initpages = (((unsigned long) __init_end) - ((unsigned long) __init_begin));
|
||||
initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
|
||||
|
||||
printk("Memory: %uk available (%ldk kernel code, %ldk data, %ldk init) [%016lx,%016lx]\n",
|
||||
printk("Memory: %luk available (%ldk kernel code, %ldk data, %ldk init) [%016lx,%016lx]\n",
|
||||
nr_free_pages() << (PAGE_SHIFT-10),
|
||||
codepages << (PAGE_SHIFT-10),
|
||||
datapages << (PAGE_SHIFT-10),
|
||||
|
Reference in New Issue
Block a user