diff options
Diffstat (limited to 'drivers/base/node.c')
| -rw-r--r-- | drivers/base/node.c | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 5116b78c6325..fc7e9bf0cdbc 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -61,34 +61,44 @@ static ssize_t node_read_meminfo(struct sys_device * dev, | |||
| 61 | si_meminfo_node(&i, nid); | 61 | si_meminfo_node(&i, nid); |
| 62 | 62 | ||
| 63 | n = sprintf(buf, "\n" | 63 | n = sprintf(buf, "\n" |
| 64 | "Node %d MemTotal: %8lu kB\n" | 64 | "Node %d MemTotal: %8lu kB\n" |
| 65 | "Node %d MemFree: %8lu kB\n" | 65 | "Node %d MemFree: %8lu kB\n" |
| 66 | "Node %d MemUsed: %8lu kB\n" | 66 | "Node %d MemUsed: %8lu kB\n" |
| 67 | "Node %d Active: %8lu kB\n" | 67 | "Node %d Active: %8lu kB\n" |
| 68 | "Node %d Inactive: %8lu kB\n" | 68 | "Node %d Inactive: %8lu kB\n" |
| 69 | "Node %d Active(anon): %8lu kB\n" | ||
| 70 | "Node %d Inactive(anon): %8lu kB\n" | ||
| 71 | "Node %d Active(file): %8lu kB\n" | ||
| 72 | "Node %d Inactive(file): %8lu kB\n" | ||
| 69 | #ifdef CONFIG_HIGHMEM | 73 | #ifdef CONFIG_HIGHMEM |
| 70 | "Node %d HighTotal: %8lu kB\n" | 74 | "Node %d HighTotal: %8lu kB\n" |
| 71 | "Node %d HighFree: %8lu kB\n" | 75 | "Node %d HighFree: %8lu kB\n" |
| 72 | "Node %d LowTotal: %8lu kB\n" | 76 | "Node %d LowTotal: %8lu kB\n" |
| 73 | "Node %d LowFree: %8lu kB\n" | 77 | "Node %d LowFree: %8lu kB\n" |
| 74 | #endif | 78 | #endif |
| 75 | "Node %d Dirty: %8lu kB\n" | 79 | "Node %d Dirty: %8lu kB\n" |
| 76 | "Node %d Writeback: %8lu kB\n" | 80 | "Node %d Writeback: %8lu kB\n" |
| 77 | "Node %d FilePages: %8lu kB\n" | 81 | "Node %d FilePages: %8lu kB\n" |
| 78 | "Node %d Mapped: %8lu kB\n" | 82 | "Node %d Mapped: %8lu kB\n" |
| 79 | "Node %d AnonPages: %8lu kB\n" | 83 | "Node %d AnonPages: %8lu kB\n" |
| 80 | "Node %d PageTables: %8lu kB\n" | 84 | "Node %d PageTables: %8lu kB\n" |
| 81 | "Node %d NFS_Unstable: %8lu kB\n" | 85 | "Node %d NFS_Unstable: %8lu kB\n" |
| 82 | "Node %d Bounce: %8lu kB\n" | 86 | "Node %d Bounce: %8lu kB\n" |
| 83 | "Node %d WritebackTmp: %8lu kB\n" | 87 | "Node %d WritebackTmp: %8lu kB\n" |
| 84 | "Node %d Slab: %8lu kB\n" | 88 | "Node %d Slab: %8lu kB\n" |
| 85 | "Node %d SReclaimable: %8lu kB\n" | 89 | "Node %d SReclaimable: %8lu kB\n" |
| 86 | "Node %d SUnreclaim: %8lu kB\n", | 90 | "Node %d SUnreclaim: %8lu kB\n", |
| 87 | nid, K(i.totalram), | 91 | nid, K(i.totalram), |
| 88 | nid, K(i.freeram), | 92 | nid, K(i.freeram), |
| 89 | nid, K(i.totalram - i.freeram), | 93 | nid, K(i.totalram - i.freeram), |
| 90 | nid, K(node_page_state(nid, NR_ACTIVE)), | 94 | nid, K(node_page_state(nid, NR_ACTIVE_ANON) + |
| 91 | nid, K(node_page_state(nid, NR_INACTIVE)), | 95 | node_page_state(nid, NR_ACTIVE_FILE)), |
| 96 | nid, K(node_page_state(nid, NR_INACTIVE_ANON) + | ||
| 97 | node_page_state(nid, NR_INACTIVE_FILE)), | ||
| 98 | nid, K(node_page_state(nid, NR_ACTIVE_ANON)), | ||
| 99 | nid, K(node_page_state(nid, NR_INACTIVE_ANON)), | ||
| 100 | nid, K(node_page_state(nid, NR_ACTIVE_FILE)), | ||
| 101 | nid, K(node_page_state(nid, NR_INACTIVE_FILE)), | ||
| 92 | #ifdef CONFIG_HIGHMEM | 102 | #ifdef CONFIG_HIGHMEM |
| 93 | nid, K(i.totalhigh), | 103 | nid, K(i.totalhigh), |
| 94 | nid, K(i.freehigh), | 104 | nid, K(i.freehigh), |