From 0b8ccc9475e8a71d398dfded1fb67d5910694e9f Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 8 Jan 2006 01:00:28 -0800
Subject: [PATCH] --- yaml --- r: 16819 b: refs/heads/master c:
 84c2008af01132c4ca257ed9b595693c611df15d h: refs/heads/master i:   16817:
 51ae3463616ad62460324c21dcc6f3d4367aabcd   16815:
 f6cf0c28a10f4d5f04f59c6b59a6b7dc23edd2e1 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a9a3ac60b6d4..cc9a34417a1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f5336e21893fafd232a9a02cfa7588ad153889a
+refs/heads/master: 84c2008af01132c4ca257ed9b595693c611df15d
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index fd47494cb989..0b98f428b07b 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/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;