Merge 3.4-rc5 into driver-core-next

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index bbffa2110d43..38fcc60e661b 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -190,14 +190,14 @@ static int kobject_add_internal(struct kobject *kobj)
 
                 /* be noisy on error issues */
                 if (error == -EEXIST)
-                        printk(KERN_ERR "%s failed for %s with "
-                               "-EEXIST, don't try to register things with "
-                               "the same name in the same directory.\n",
-                               __func__, kobject_name(kobj));
+                        WARN(1, "%s failed for %s with "
+                             "-EEXIST, don't try to register things with "
+                             "the same name in the same directory.\n",
+                             __func__, kobject_name(kobj));
                 else
-                        printk(KERN_ERR "%s failed for %s (%d)\n",
-                               __func__, kobject_name(kobj), error);
-                dump_stack();
+                        WARN(1, "%s failed for %s (error: %d parent: %s)\n",
+                             __func__, kobject_name(kobj), error,
+                             parent ? kobject_name(parent) : "'none'");
         } else
                 kobj->state_in_sysfs = 1;