diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 00:59:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 00:59:09 -0700 |
commit | 900965d1b18d871b56f7839c4f76ce7ee6a6df12 (patch) | |
tree | b2da47167bea5da3349f46e46605dde1f233f508 /driver | |
parent | 5b4d9054b56eb13618892ec90a81dc66ff31b3b0 (diff) | |
download | patches-900965d1b18d871b56f7839c4f76ce7ee6a6df12.tar.gz |
2.6.17-git12 refresh
Diffstat (limited to 'driver')
-rw-r--r-- | driver/put_device-might_sleep.patch | 2 | ||||
-rw-r--r-- | driver/sysfs-crash-debugging.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/driver/put_device-might_sleep.patch b/driver/put_device-might_sleep.patch index 49f8de2530633..adb9bb8f6f54a 100644 --- a/driver/put_device-might_sleep.patch +++ b/driver/put_device-might_sleep.patch @@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/base/core.c +++ gregkh-2.6/drivers/base/core.c -@@ -427,6 +427,7 @@ struct device * get_device(struct device +@@ -460,6 +460,7 @@ struct device * get_device(struct device */ void put_device(struct device * dev) { diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index ac7da1c3c5c84..75e72da11d2b7 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 -@@ -393,6 +393,7 @@ void die(const char * str, struct pt_reg +@@ -431,6 +431,7 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> NOTIFY_STOP) { --- gregkh-2.6.orig/arch/x86_64/kernel/traps.c +++ gregkh-2.6/arch/x86_64/kernel/traps.c -@@ -438,6 +438,7 @@ void __kprobes __die(const char * str, s +@@ -488,6 +488,7 @@ void __kprobes __die(const char * str, s printk("DEBUG_PAGEALLOC"); #endif printk("\n"); |