25 files changed, 219 insertions, 112 deletions

diff --git a/Documentation/ABI/stable/sysfs-devices b/Documentation/ABI/stable/sysfs-devices
new file mode 100644
index 000000000000..43f78b88da28
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-devices
@@ -0,0 +1,10 @@
+# Note: This documents additional properties of any device beyond what
+# is documented in Documentation/sysfs-rules.txt
+
+What:           /sys/devices/*/of_path
+Date:           February 2015
+Contact:        Device Tree mailing list <devicetree@vger.kernel.org>
+Description:
+                Any device associated with a device-tree node will have
+                an of_path symlink pointing to the corresponding device
+                node in /sys/firmware/devicetree/
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index 02f8331edb8b..58d0ac4df946 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -81,6 +81,16 @@ format in the sign-off area:
      git cherry-pick fd21073
      git cherry-pick <this commit>
 
+Also, some patches may have kernel version prerequisites.  This can be
+specified in the following format in the sign-off area:
+
+     Cc:  <stable@vger.kernel.org> # 3.3.x-
+
+   The tag has the meaning of:
+     git cherry-pick <this commit>
+
+   For each "-stable" tree starting with the specified version.
+
 Following the submission:
 
  - The sender will receive an ACK when the patch has been accepted into the
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 3ead3af4be61..2ba4cac080c5 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -94,6 +94,7 @@ int
 attribute_container_unregister(struct attribute_container *cont)
 {
         int retval = -EBUSY;
+
         mutex_lock(&attribute_container_mutex);
         spin_lock(&cont->containers.k_lock);
         if (!list_empty(&cont->containers.k_list))
@@ -349,6 +350,7 @@ int
 attribute_container_add_class_device(struct device *classdev)
 {
         int error = device_add(classdev);
+
         if (error)
                 return error;
         return attribute_container_add_attrs(classdev);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 876bae5ade33..79bc203f51ef 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -515,11 +515,11 @@ int bus_add_device(struct device *dev)
                         goto out_put;
                 error = device_add_groups(dev, bus->dev_groups);
                 if (error)
-                        goto out_groups;
+                        goto out_id;
                 error = sysfs_create_link(&bus->p->devices_kset->kobj,
                                                 &dev->kobj, dev_name(dev));
                 if (error)
-                        goto out_id;
+                        goto out_groups;
                 error = sysfs_create_link(&dev->kobj,
                                 &dev->bus->p->subsys.kobj, "subsystem");
                 if (error)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 6e64563361f0..9c2ba1c97c42 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -62,15 +62,21 @@ static int cache_setup_of_node(unsigned int cpu)
                 return -ENOENT;
         }
 
-        while (np && index < cache_leaves(cpu)) {
+        while (index < cache_leaves(cpu)) {
                 this_leaf = this_cpu_ci->info_list + index;
                 if (this_leaf->level != 1)
                         np = of_find_next_cache_node(np);
                 else
                         np = of_node_get(np);/* cpu node itself */
+                if (!np)
+                        break;
                 this_leaf->of_node = np;
                 index++;
         }
+
+        if (index != cache_leaves(cpu)) /* not all OF nodes populated */
+                return -ENOENT;
+
         return 0;
 }
 
@@ -189,8 +195,11 @@ static int detect_cache_attributes(unsigned int cpu)
          * will be set up here only if they are not populated already
          */
         ret = cache_shared_cpu_map_setup(cpu);
-        if (ret)
+        if (ret) {
+                pr_warn("Unable to detect cache hierarcy from DT for CPU %d\n",
+                        cpu);
                 goto free_ci;
+        }
         return 0;
 
 free_ci:
diff --git a/drivers/base/class.c b/drivers/base/class.c
index f96f70419a78..6e810881e48b 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -90,6 +90,7 @@ int class_create_file_ns(struct class *cls, const struct class_attribute *attr,
                          const void *ns)
 {
         int error;
+
         if (cls)
                 error = sysfs_create_file_ns(&cls->p->subsys.kobj,
                                              &attr->attr, ns);
@@ -488,6 +489,7 @@ ssize_t show_class_attr_string(struct class *class,
                                struct class_attribute *attr, char *buf)
 {
         struct class_attribute_string *cs;
+
         cs = container_of(attr, struct class_attribute_string, attr);
         return snprintf(buf, PAGE_SIZE, "%s\n", cs->str);
 }
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 07304a3b9ee2..cadf165651d8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -805,8 +805,16 @@ static void cleanup_device_parent(struct device *dev)
 
 static int device_add_class_symlinks(struct device *dev)
 {
+        struct device_node *of_node = dev_of_node(dev);
         int error;
 
+        if (of_node) {
+                error = sysfs_create_link(&dev->kobj, &of_node->kobj,"of_node");
+                if (error)
+                        dev_warn(dev, "Error %d creating of_node link\n",e