diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-01-08 01:00:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:12:38 -0800 |
| commit | 84c2008af01132c4ca257ed9b595693c611df15d (patch) | |
| tree | a93bb1828e5b56ba041f8227ded78c9f04960a76 | |
| parent | 9f5336e21893fafd232a9a02cfa7588ad153889a (diff) | |
| download | talos-op-linux-84c2008af01132c4ca257ed9b595693c611df15d.tar.gz talos-op-linux-84c2008af01132c4ca257ed9b595693c611df15d.zip | |
[PATCH] revert "mm: page_state fixes"
Hugh says:
page_alloc_cpu_notify() specifically contains code to
/* Add dead cpu's page_states to our own. */
which handles this more efficiently.
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fd47494cb989..0b98f428b07b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1204,6 +1204,7 @@ static void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask) int cpu = 0; memset(ret, 0, sizeof(*ret)); + cpus_and(*cpumask, *cpumask, cpu_online_map); cpu = first_cpu(*cpumask); while (cpu < NR_CPUS) { @@ -1256,7 +1257,7 @@ unsigned long read_page_state_offset(unsigned long offset) unsigned long ret = 0; int cpu; - for_each_cpu(cpu) { + for_each_online_cpu(cpu) { unsigned long in; in = (unsigned long)&per_cpu(page_states, cpu) + offset; |
