diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-13 22:05:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-13 22:05:19 -0800 |
| commit | 865abfdf07378fd1395915906b74712269bceb5d (patch) | |
| tree | 08e8134d84f54583a6eff8dbe5ea58f7b33e0dcc /driver | |
| parent | b4aae55f4adabb204f2d172edd8e484a4f53bc53 (diff) | |
| download | patches-865abfdf07378fd1395915906b74712269bceb5d.tar.gz | |
2.6.24-rc2-git4 version update
Diffstat (limited to 'driver')
6 files changed, 11 insertions, 11 deletions
diff --git a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch index 93caee869e62aa..40e3cab13e9d96 100644 --- a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch +++ b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch @@ -146,7 +146,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/mm/slub.c +++ b/mm/slub.c -@@ -4090,7 +4090,7 @@ static int __init slab_sysfs_init(void) +@@ -4088,7 +4088,7 @@ static int __init slab_sysfs_init(void) int err; slab_kset = kset_create_and_register("slab", &slab_uevent_ops, diff --git a/driver/kset-convert-slub-to-use-kset_create.patch b/driver/kset-convert-slub-to-use-kset_create.patch index 134d9d1c83e691..e75ab91de68e60 100644 --- a/driver/kset-convert-slub-to-use-kset_create.patch +++ b/driver/kset-convert-slub-to-use-kset_create.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/mm/slub.c +++ b/mm/slub.c -@@ -3960,7 +3960,7 @@ static struct kset_uevent_ops slab_ueven +@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven .filter = uevent_filter, }; @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define ID_STR_LENGTH 64 -@@ -4013,7 +4013,7 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4011,7 +4011,7 @@ static int sysfs_slab_add(struct kmem_ca * This is typically the case for debug situations. In that * case we can catch duplicate names easily. */ @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> name = s->name; } else { /* -@@ -4024,7 +4024,7 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4022,7 +4022,7 @@ static int sysfs_slab_add(struct kmem_ca } kobject_set_name(&s->kobj, name); @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> s->kobj.ktype = &slab_ktype; kobject_init(&s->kobj); err = kobject_add(&s->kobj); -@@ -4069,9 +4069,8 @@ static int sysfs_slab_alias(struct kmem_ +@@ -4067,9 +4067,8 @@ static int sysfs_slab_alias(struct kmem_ /* * If we have a leftover link then remove it. */ @@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } al = kmalloc(sizeof(struct saved_alias), GFP_KERNEL); -@@ -4090,8 +4089,9 @@ static int __init slab_sysfs_init(void) +@@ -4088,8 +4087,9 @@ static int __init slab_sysfs_init(void) struct kmem_cache *s; int err; diff --git a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch index c92411e748dabc..b25ec031f9e1ed 100644 --- a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch +++ b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> corresponding debug option. All options can be set on a slab that does --- a/mm/slub.c +++ b/mm/slub.c -@@ -4090,7 +4090,7 @@ static int __init slab_sysfs_init(void) +@@ -4088,7 +4088,7 @@ static int __init slab_sysfs_init(void) int err; slab_kset = kset_create_and_register("slab", &slab_uevent_ops, diff --git a/driver/remove-struct-kobj_type-from-struct-kset.patch b/driver/remove-struct-kobj_type-from-struct-kset.patch index d3318a0d2834d9..a4366e205471eb 100644 --- a/driver/remove-struct-kobj_type-from-struct-kset.patch +++ b/driver/remove-struct-kobj_type-from-struct-kset.patch @@ -779,7 +779,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** --- a/mm/slub.c +++ b/mm/slub.c -@@ -3960,7 +3960,7 @@ static struct kset_uevent_ops slab_ueven +@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven .filter = uevent_filter, }; @@ -788,7 +788,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define ID_STR_LENGTH 64 -@@ -4023,8 +4023,9 @@ static int sysfs_slab_add(struct kmem_ca +@@ -4021,8 +4021,9 @@ static int sysfs_slab_add(struct kmem_ca name = create_unique_id(s); } diff --git a/driver/struct-user_info-sysfs.patch b/driver/struct-user_info-sysfs.patch index cf9d32a5a175da..104ae424cb2d6d 100644 --- a/driver/struct-user_info-sysfs.patch +++ b/driver/struct-user_info-sysfs.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -547,18 +547,13 @@ struct user_struct { +@@ -548,18 +548,13 @@ struct user_struct { #ifdef CONFIG_FAIR_USER_SCHED struct task_group *tg; #ifdef CONFIG_SYSFS diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index d089e69ed06f77..854ecb31ee98b6 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -763,12 +763,21 @@ static void run_init_process(char *init_ +@@ -761,12 +761,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } |