diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-19 16:21:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-19 16:21:05 -0700 |
| commit | 483ed7a4152aa6b568518871f42cee0823d61584 (patch) | |
| tree | eb82f8b115053e610c17279c60ef7637a96879d0 /driver | |
| parent | f946bcab1c35689ca563072cde8ba3a4844fbd14 (diff) | |
| download | patches-483ed7a4152aa6b568518871f42cee0823d61584.tar.gz | |
more patches added
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/platform_bus-learns-about-modalias.patch | 2 | ||||
| -rw-r--r-- | driver/warn-when-statically-allocated-kobjects-are-used.patch | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/driver/platform_bus-learns-about-modalias.patch b/driver/platform_bus-learns-about-modalias.patch index d1ca1c07041abe..47345ef6f1d1de 100644 --- a/driver/platform_bus-learns-about-modalias.patch +++ b/driver/platform_bus-learns-about-modalias.patch @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + struct platform_device *pdev = to_platform_device(dev); + unsigned len = strlen(pdev->name); + -+ len = min(len, (size_t)(PAGE_SIZE - 1)); ++ len = min_t(unsigned, len, PAGE_SIZE - 1); + memcpy(buf, pdev->name, len); + buf[PAGE_SIZE - 1] = 0; + return len; diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index 80424ad46b0a71..2be8b09ad3e246 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -30,9 +30,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - arch/i386/kernel/vmlinux.lds.S | 2 ++ - lib/kobject.c | 38 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+) + arch/i386/kernel/vmlinux.lds.S | 2 + + lib/kobject.c | 43 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) --- gregkh-2.6.orig/arch/i386/kernel/vmlinux.lds.S +++ gregkh-2.6/arch/i386/kernel/vmlinux.lds.S @@ -56,10 +56,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * populate_dir - populate directory with attributes. -@@ -120,6 +122,41 @@ char *kobject_get_path(struct kobject *k +@@ -120,6 +122,46 @@ char *kobject_get_path(struct kobject *k return path; } ++#ifdef CONFIG_X86_32 +static int ptr_in_range(void *ptr, void *start, void *end) +{ + /* @@ -93,12 +94,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + /* dump_stack(); */ + pr_debug("---- end silly warning ----\n"); +} -+ ++#else ++static void verify_dynamic_kobject_allocation(struct kobject *kobj) ++{ ++} ++#endif + /** * kobject_init - initialize object. * @kobj: object in question. -@@ -127,6 +164,7 @@ char *kobject_get_path(struct kobject *k +@@ -127,6 +169,7 @@ char *kobject_get_path(struct kobject *k void kobject_init(struct kobject * kobj) { WARN_ON(atomic_read(&kobj->kref.refcount)); |