vserver 1.9.3

[linux-2.6.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index c118736..df74785 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -19,7 +19,7 @@ static struct sysdev_class node_class = {
 static ssize_t node_read_cpumap(struct sys_device * dev, char * buf)
 {
        struct node *node_dev = to_node(dev);
-       cpumask_t mask = node_dev->cpumap;
+       cpumask_t mask = node_to_cpumask(node_dev->sysdev.id);
        int len;
 
        /* 2004/06/03: buf currently PAGE_SIZE, need > 1 char per 4 bits. */
@@ -38,11 +38,19 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
        int n;
        int nid = dev->id;
        struct sysinfo i;
+       unsigned long inactive;
+       unsigned long active;
+       unsigned long free;
+
        si_meminfo_node(&i, nid);
+       __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
+
        n = sprintf(buf, "\n"
                       "Node %d MemTotal:     %8lu kB\n"
                       "Node %d MemFree:      %8lu kB\n"
                       "Node %d MemUsed:      %8lu kB\n"
+                      "Node %d Active:       %8lu kB\n"
+                      "Node %d Inactive:     %8lu kB\n"
                       "Node %d HighTotal:    %8lu kB\n"
                       "Node %d HighFree:     %8lu kB\n"
                       "Node %d LowTotal:     %8lu kB\n"
@@ -50,6 +58,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                       nid, K(i.totalram),
                       nid, K(i.freeram),
                       nid, K(i.totalram - i.freeram),
+                      nid, K(active),
+                      nid, K(inactive),
                       nid, K(i.totalhigh),
                       nid, K(i.freehigh),
                       nid, K(i.totalram - i.totalhigh),
@@ -111,7 +121,6 @@ int __init register_node(struct node *node, int num, struct node *parent)
 {
        int error;
 
-       node->cpumap = node_to_cpumask(num);
        node->sysdev.id = num;
        node->sysdev.cls = &node_class;
        error = sysdev_register(&node->sysdev);