---

yaml --- r: 16819 b: refs/heads/master c: 84c2008 h: refs/heads/master i: 16817: 51ae346 16815: f6cf0c2 v: v3
git-mirror · Jan 9, 2006 · 0b8ccc9 · 0b8ccc9
1 parent 365879b
commit 0b8ccc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;