diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/node.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 001e6f6b9c1b..475e33f76e0d 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
40 | int n; | 40 | int n; |
41 | int nid = dev->id; | 41 | int nid = dev->id; |
42 | struct sysinfo i; | 42 | struct sysinfo i; |
43 | unsigned long inactive; | ||
44 | unsigned long active; | ||
45 | unsigned long free; | ||
46 | 43 | ||
47 | si_meminfo_node(&i, nid); | 44 | si_meminfo_node(&i, nid); |
48 | __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); | ||
49 | |||
50 | 45 | ||
51 | n = sprintf(buf, "\n" | 46 | n = sprintf(buf, "\n" |
52 | "Node %d MemTotal: %8lu kB\n" | 47 | "Node %d MemTotal: %8lu kB\n" |
@@ -74,8 +69,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
74 | nid, K(i.totalram), | 69 | nid, K(i.totalram), |
75 | nid, K(i.freeram), | 70 | nid, K(i.freeram), |
76 | nid, K(i.totalram - i.freeram), | 71 | nid, K(i.totalram - i.freeram), |
77 | nid, K(active), | 72 | nid, node_page_state(nid, NR_ACTIVE), |
78 | nid, K(inactive), | 73 | nid, node_page_state(nid, NR_INACTIVE), |
79 | #ifdef CONFIG_HIGHMEM | 74 | #ifdef CONFIG_HIGHMEM |
80 | nid, K(i.totalhigh), | 75 | nid, K(i.totalhigh), |
81 | nid, K(i.freehigh), | 76 | nid, K(i.freehigh), |