Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[~andy/linux] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 5d4517ccc422c392e308b83376b2d537fce67485..904b27caf697df2c0d14d1cab426212bad27bb25 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -87,7 +87,7 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
        for (i = 0; i < MAX_NR_ZONES; i++) {
                struct zone *z = &pg->node_zones[i];
                for (cpu = 0; cpu < NR_CPUS; cpu++) {
-                       struct per_cpu_pageset *ps = &z->pageset[cpu];
+                       struct per_cpu_pageset *ps = zone_pcp(z,cpu);
                        numa_hit += ps->numa_hit;
                        numa_miss += ps->numa_miss;
                        numa_foreign += ps->numa_foreign;