From: Christoph Lameter <clameter@sgi.com>
To: akpm@osdl.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Nick Piggin <nickpiggin@yahoo.com.au>,
linux-mm@kvack.org, Christoph Lameter <clameter@sgi.com>,
Nikita Danilov <nikita@clusterfs.com>, Andi Kleen <ak@suse.de>
Subject: [RFC 4/8] Drop free_pages()
Date: Thu, 25 Jan 2007 21:42:14 -0800 (PST) [thread overview]
Message-ID: <20070126054214.10564.14145.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20070126054153.10564.43218.sendpatchset@schroedinger.engr.sgi.com>
Further simplification for nr_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.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.20-rc6/include/linux/swap.h
===================================================================
--- linux-2.6.20-rc6.orig/include/linux/swap.h 2007-01-25 11:18:12.000000000 -0800
+++ linux-2.6.20-rc6/include/linux/swap.h 2007-01-25 20:19:24.000000000 -0800
@@ -170,11 +170,14 @@ extern void swapin_readahead(swp_entry_t
extern unsigned long totalram_pages;
extern unsigned long totalreserve_pages;
extern long nr_swap_pages;
-extern unsigned int nr_free_pages(void);
extern unsigned int nr_free_pages_pgdat(pg_data_t *pgdat);
extern unsigned int nr_free_buffer_pages(void);
extern unsigned int nr_free_pagecache_pages(void);
+/* Definition of global_page_state not available yet */
+#define nr_free_pages() global_page_state(NR_FREE_PAGES)
+
+
/* linux/mm/swap.c */
extern void FASTCALL(lru_cache_add(struct page *));
extern void FASTCALL(lru_cache_add_active(struct page *));
Index: linux-2.6.20-rc6/mm/page_alloc.c
===================================================================
--- linux-2.6.20-rc6.orig/mm/page_alloc.c 2007-01-25 11:19:46.000000000 -0800
+++ linux-2.6.20-rc6/mm/page_alloc.c 2007-01-25 20:19:24.000000000 -0800
@@ -1441,16 +1441,6 @@ fastcall void free_pages(unsigned long a
EXPORT_SYMBOL(free_pages);
-/*
- * Total amount of free (allocatable) RAM:
- */
-unsigned int nr_free_pages(void)
-{
- return global_page_state(NR_FREE_PAGES);
-}
-
-EXPORT_SYMBOL(nr_free_pages);
-
#ifdef CONFIG_NUMA
unsigned int nr_free_pages_pgdat(pg_data_t *pgdat)
{
Index: linux-2.6.20-rc6/kernel/power/main.c
===================================================================
--- linux-2.6.20-rc6.orig/kernel/power/main.c 2007-01-25 20:19:17.000000000 -0800
+++ linux-2.6.20-rc6/kernel/power/main.c 2007-01-25 20:19:30.000000000 -0800
@@ -20,6 +20,7 @@
#include <linux/cpu.h>
#include <linux/resume-trace.h>
#include <linux/freezer.h>
+#include <linux/vmstat.h>
#include "power.h"
@@ -72,7 +73,8 @@ static int suspend_prepare(suspend_state
goto Thaw;
}
- if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
+ if ((free_pages = global_page_state(NR_FREE_PAGES))
+ < FREE_PAGE_NUMBER) {
pr_debug("PM: free some memory\n");
shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
if (nr_free_pages() < FREE_PAGE_NUMBER) {
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2007-01-26 5:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-26 5:41 [RFC 0/8] Use ZVCs for accurate writeback ratio determination Christoph Lameter
2007-01-26 5:41 ` [RFC 1/8] Use ZVC for inactive and active counts Christoph Lameter
2007-01-26 5:42 ` [RFC 2/8] Use ZVC for free_pages Christoph Lameter
2007-01-26 5:42 ` [RFC 3/8] Reorder ZVCs according to cacheline Christoph Lameter
2007-01-26 5:42 ` Christoph Lameter [this message]
2007-01-26 5:42 ` [RFC 5/8] Drop nr_free_pages_pgdat() Christoph Lameter
2007-01-26 5:42 ` [RFC 6/8] Drop __get_zone_counts() Christoph Lameter
2007-01-26 5:42 ` [RFC 7/8] Drop get_zone_counts() Christoph Lameter
2007-01-26 5:42 ` [RFC 8/8] Fix writeback calculation Christoph Lameter
2007-01-26 12:22 ` [RFC 0/8] Use ZVCs for accurate writeback ratio determination Nick Piggin
2007-01-26 15:49 ` Christoph Lameter
2007-01-29 2:40 ` Nick Piggin
2007-01-29 16:56 ` Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070126054214.10564.14145.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=a.p.zijlstra@chello.nl \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=linux-mm@kvack.org \
--cc=nickpiggin@yahoo.com.au \
--cc=nikita@clusterfs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).