aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 09:57:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 09:57:29 -0700
commit261d49776d3155600bbf4f441cfc7a2c3993074d (patch)
treeb8f99909c4ee6a814e461788f2c50d0f8c9f0287 /driver
parent96239ed0320432f6a1f81eee2a30e0f3c6da1039 (diff)
downloadpatches-261d49776d3155600bbf4f441cfc7a2c3993074d.tar.gz
update to 2.6.17-git10
Diffstat (limited to 'driver')
-rw-r--r--driver/sysfs-crash-debugging.patch2
-rw-r--r--driver/warn-when-statically-allocated-kobjects-are-used.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch
index 3e4f83403579d..ac7da1c3c5c84 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
-@@ -386,6 +386,7 @@ void die(const char * str, struct pt_reg
+@@ -393,6 +393,7 @@ void die(const char * str, struct pt_reg
#endif
if (nl)
printk("\n");
diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch
index 2be8b09ad3e24..bb8d97d589983 100644
--- a/driver/warn-when-statically-allocated-kobjects-are-used.patch
+++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
RODATA
- /* writeable */
+ . = ALIGN(4);
--- gregkh-2.6.orig/lib/kobject.c
+++ gregkh-2.6/lib/kobject.c
@@ -15,6 +15,8 @@