Merge branch 'akpm' (patches from Andrew)

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

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 4a4ae86..c56d34f 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -26,43 +26,47 @@ static struct bus_type node_subsys = {
        .dev_name = "node",
 };
 
-
-static ssize_t node_read_cpumap(struct device *dev, bool list, char *buf)
+static inline ssize_t cpumap_read(struct file *file, struct kobject *kobj,
+                                 struct bin_attribute *attr, char *buf,
+                                 loff_t off, size_t count)
 {
-       ssize_t n;
-       cpumask_var_t mask;
+       struct device *dev = kobj_to_dev(kobj);
        struct node *node_dev = to_node(dev);
-
-       /* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */
-       BUILD_BUG_ON((NR_CPUS/32 * 9) > (PAGE_SIZE-1));
+       cpumask_var_t mask;
+       ssize_t n;
 
        if (!alloc_cpumask_var(&mask, GFP_KERNEL))
                return 0;
 
        cpumask_and(mask, cpumask_of_node(node_dev->dev.id), cpu_online_mask);
-       n = cpumap_print_to_pagebuf(list, buf, mask);
+       n = cpumap_print_bitmask_to_buf(buf, mask, off, count);
        free_cpumask_var(mask);
 
        return n;
 }
 
-static inline ssize_t cpumap_show(struct device *dev,
-                                 struct device_attribute *attr,
-                                 char *buf)
+static BIN_ATTR_RO(cpumap, 0);
+
+static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj,
+                                  struct bin_attribute *attr, char *buf,
+                                  loff_t off, size_t count)
 {
-       return node_read_cpumap(dev, false, buf);
-}
+       struct device *dev = kobj_to_dev(kobj);
+       struct node *node_dev = to_node(dev);
+       cpumask_var_t mask;
+       ssize_t n;
+
+       if (!alloc_cpumask_var(&mask, GFP_KERNEL))
+               return 0;
 
-static DEVICE_ATTR_RO(cpumap);
+       cpumask_and(mask, cpumask_of_node(node_dev->dev.id), cpu_online_mask);
+       n = cpumap_print_list_to_buf(buf, mask, off, count);
+       free_cpumask_var(mask);
 
-static inline ssize_t cpulist_show(struct device *dev,
-                                  struct device_attribute *attr,
-                                  char *buf)
-{
-       return node_read_cpumap(dev, true, buf);
+       return n;
 }
 
-static DEVICE_ATTR_RO(cpulist);
+static BIN_ATTR_RO(cpulist, 0);
 
 /**
  * struct node_access_nodes - Access class device to hold user visible
@@ -75,7 +79,7 @@ static DEVICE_ATTR_RO(cpulist);
 struct node_access_nodes {
        struct device           dev;
        struct list_head        list_node;
-       unsigned                access;
+       unsigned int            access;
 #ifdef CONFIG_HMEM_REPORTING
        struct node_hmem_attrs  hmem_attrs;
 #endif
@@ -122,7 +126,7 @@ static void node_access_release(struct device *dev)
 }
 
 static struct node_access_nodes *node_init_node_access(struct node *node,
-                                                      unsigned access)
+                                                      unsigned int access)
 {
        struct node_access_nodes *access_node;
        struct device *dev;
@@ -187,7 +191,7 @@ static struct attribute *access_attrs[] = {
  * @access: The access class the for the given attributes
  */
 void node_set_perf_attrs(unsigned int nid, struct node_hmem_attrs *hmem_attrs,
-                        unsigned access)
+                        unsigned int access)
 {
        struct node_access_nodes *c;
        struct node *node;
@@ -557,15 +561,28 @@ static ssize_t node_read_distance(struct device *dev,
 static DEVICE_ATTR(distance, 0444, node_read_distance, NULL);
 
 static struct attribute *node_dev_attrs[] = {
-       &dev_attr_cpumap.attr,
-       &dev_attr_cpulist.attr,
        &dev_attr_meminfo.attr,
        &dev_attr_numastat.attr,
        &dev_attr_distance.attr,
        &dev_attr_vmstat.attr,
        NULL
 };
-ATTRIBUTE_GROUPS(node_dev);
+
+static struct bin_attribute *node_dev_bin_attrs[] = {
+       &bin_attr_cpumap,
+       &bin_attr_cpulist,
+       NULL
+};
+
+static const struct attribute_group node_dev_group = {
+       .attrs = node_dev_attrs,
+       .bin_attrs = node_dev_bin_attrs
+};
+
+static const struct attribute_group *node_dev_groups[] = {
+       &node_dev_group,
+       NULL
+};
 
 #ifdef CONFIG_HUGETLBFS
 /*
@@ -711,7 +728,7 @@ int register_cpu_under_node(unsigned int cpu, unsigned int nid)
  */
 int register_memory_node_under_compute_node(unsigned int mem_nid,
                                            unsigned int cpu_nid,
-                                           unsigned access)
+                                           unsigned int access)
 {
        struct node *init_node, *targ_node;
        struct node_access_nodes *initiator, *target;
@@ -768,8 +785,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
 #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
 static int __ref get_nid_for_pfn(unsigned long pfn)
 {
-       if (!pfn_valid_within(pfn))
-               return -1;
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
        if (system_state < SYSTEM_RUNNING)
                return early_pfn_to_nid(pfn);