aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-23 09:08:35 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-05-23 09:08:35 -0700
commitc73f4933327f9e928e894710284d058ca4640b96 (patch)
tree390a444a6d6059aeb0b4fc8d7f8885c05d85d93d /driver
parentcc2ddaccce45eac258d3ad0a9b7ac9dc884b10b1 (diff)
downloadpatches-c73f4933327f9e928e894710284d058ca4640b96.tar.gz
2.6.17-rc4-git10 refresh
Diffstat (limited to 'driver')
-rw-r--r--driver/shutup-kobject_add-errors-so-as-not-to-scare-the-children.patch36
-rw-r--r--driver/sysfs-crash-debugging.patch2
2 files changed, 1 insertions, 37 deletions
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
deleted file mode 100644
index 65cee9ebf75af..0000000000000
--- a/driver/shutup-kobject_add-errors-so-as-not-to-scare-the-children.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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;
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch
index 2ab142db9c54c..3e4f83403579d 100644
--- a/driver/sysfs-crash-debugging.patch
+++ b/driver/sysfs-crash-debugging.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/arch/i386/kernel/traps.c
+++ gregkh-2.6/arch/i386/kernel/traps.c
-@@ -388,6 +388,7 @@ void die(const char * str, struct pt_reg
+@@ -386,6 +386,7 @@ void die(const char * str, struct pt_reg
#endif
if (nl)
printk("\n");