Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 2872e86837b2bb0013b1d2ea9b7d1095d17cd33c..ce012a9c6201ace3fcf143fcf02f424ce0d5c29b 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -160,6 +160,18 @@ static ssize_t node_read_numastat(struct sys_device * dev,
 }
 static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
 
+static ssize_t node_read_vmstat(struct sys_device *dev,
+                               struct sysdev_attribute *attr, char *buf)
+{
+       int nid = dev->id;
+       return sprintf(buf,
+               "nr_written %lu\n"
+               "nr_dirtied %lu\n",
+               node_page_state(nid, NR_WRITTEN),
+               node_page_state(nid, NR_DIRTIED));
+}
+static SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
+
 static ssize_t node_read_distance(struct sys_device * dev,
                        struct sysdev_attribute *attr, char * buf)
 {
@@ -243,6 +255,7 @@ int register_node(struct node *node, int num, struct node *parent)
                sysdev_create_file(&node->sysdev, &attr_meminfo);
                sysdev_create_file(&node->sysdev, &attr_numastat);
                sysdev_create_file(&node->sysdev, &attr_distance);
+               sysdev_create_file(&node->sysdev, &attr_vmstat);
 
                scan_unevictable_register_node(node);
 
@@ -267,6 +280,7 @@ void unregister_node(struct node *node)
        sysdev_remove_file(&node->sysdev, &attr_meminfo);
        sysdev_remove_file(&node->sysdev, &attr_numastat);
        sysdev_remove_file(&node->sysdev, &attr_distance);
+       sysdev_remove_file(&node->sysdev, &attr_vmstat);
 
        scan_unevictable_unregister_node(node);
        hugetlb_unregister_node(node);          /* no-op, if memoryless node */
@@ -409,25 +423,27 @@ static int link_mem_sections(int nid)
        unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn;
        unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages;
        unsigned long pfn;
+       struct memory_block *mem_blk = NULL;
        int err = 0;
 
        for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
                unsigned long section_nr = pfn_to_section_nr(pfn);
                struct mem_section *mem_sect;
-               struct memory_block *mem_blk;
                int ret;
 
                if (!present_section_nr(section_nr))
                        continue;
                mem_sect = __nr_to_section(section_nr);
-               mem_blk = find_memory_block(mem_sect);
+               mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
                ret = register_mem_sect_under_node(mem_blk, nid);
                if (!err)
                        err = ret;
 
                /* discard ref obtained in find_memory_block() */
-               kobject_put(&mem_blk->sysdev.kobj);
        }
+
+       if (mem_blk)
+               kobject_put(&mem_blk->sysdev.kobj);
        return err;
 }