make kobject_add be quiet as it scares the children

also rebase to 2.6.17-rc4-git6

2 files changed, 70 insertions, 0 deletions

diff --git a/driver/kobject_add-make-people-pay-attention-to-errors.patch b/driver/kobject_add-make-people-pay-attention-to-errors.patch
new file mode 100644
index 0000000000000..747cd268f228c
--- /dev/null
+++ b/driver/kobject_add-make-people-pay-attention-to-errors.patch
@@ -0,0 +1,34 @@
+From foo@baz Tue Apr  9 12:12:43 2002
+Date: Thu, 18 May 2006 10:39:21 -0700
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: kobject: make people pay attention to kobject_add errors
+
+These really need to be fixed, shout it out to the world.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ lib/kobject.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- gregkh-2.6.orig/lib/kobject.c
++++ gregkh-2.6/lib/kobject.c
+@@ -198,14 +198,14 @@ int kobject_add(struct kobject * kobj)
+ 
+ 		/* be noisy on error issues */
+ 		if (error == -EEXIST)
+-			pr_debug("kobject_add failed for %s with -EEXIST, "
++			printk("kobject_add failed for %s with -EEXIST, "
+ 			       "don't try to register things with the "
+ 			       "same name in the same directory.\n",
+ 			       kobject_name(kobj));
+ 		else
+-			pr_debug("kobject_add failed for %s (%d)\n",
++			printk("kobject_add failed for %s (%d)\n",
+ 			       kobject_name(kobj), error);
+-		/* dump_stack(); */
++		 dump_stack();
+ 	}
+ 
+ 	return error;
diff --git a/driver/shutup-kobject_add-errors-so-as-not-to-scare-the-children.patch b/driver/shutup-kobject_add-errors-so-as-not-to-scare-the-children.patch
new file mode 100644
index 0000000000000..65cee9ebf75af
--- /dev/null
+++ b/driver/shutup-kobject_add-errors-so-as-not-to-scare-the-children.patch
@@ -0,0 +1,36 @@
+From foo@baz Tue Apr  9 12:12:43 2002
+Date: Thu, 18 May 2006 10:39:21 -0700
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: kobject: quiet errors in kobject_add
+
+People don't like released kernels yelling at them, no matter how real
+the error might be.  So only report it if CONFIG_KOBJECT_DEBUG is
+enabled.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ lib/kobject.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- gregkh-2.6.orig/lib/kobject.c
++++ gregkh-2.6/lib/kobject.c
+@@ -198,14 +198,14 @@ int kobject_add(struct kobject * kobj)
+ 
+ 		/* be noisy on error issues */
+ 		if (error == -EEXIST)
+-			printk("kobject_add failed for %s with -EEXIST, "
++			pr_debug("kobject_add failed for %s with -EEXIST, "
+ 			       "don't try to register things with the "
+ 			       "same name in the same directory.\n",
+ 			       kobject_name(kobj));
+ 		else
+-			printk("kobject_add failed for %s (%d)\n",
++			pr_debug("kobject_add failed for %s (%d)\n",
+ 			       kobject_name(kobj), error);
+-		dump_stack();
++		/* dump_stack(); */
+ 	}
+ 
+ 	return error;