aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-20 21:47:50 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-20 21:47:50 -0700
commit1ca152c6b58996b99a85066e924584b179d56ccb (patch)
tree743a58b87b43aab2477b97b7afbdbad3c63bc35e /driver
parentb296d635cf093e248d9260ad2f6ee88cd92c6504 (diff)
downloadpatches-1ca152c6b58996b99a85066e924584b179d56ccb.tar.gz
2.6.23-git15 update
Diffstat (limited to 'driver')
-rw-r--r--driver/block-device.patch4
-rw-r--r--driver/ide-convert-from-class_device-to-device-for-ide-tape.patch4
-rw-r--r--driver/nozomi.patch2
-rw-r--r--driver/remove-struct-kobj_type-from-struct-kset.patch10
-rw-r--r--driver/sysfs-crash-debugging.patch4
-rw-r--r--driver/sysfs-trivial-fix-sysfs_create_file-kerneldoc-spelling-mistake.patch29
-rw-r--r--driver/warn-when-statically-allocated-kobjects-are-used.patch2
7 files changed, 13 insertions, 42 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch
index 385d7ad939c083..246a618aac2b98 100644
--- a/driver/block-device.patch
+++ b/driver/block-device.patch
@@ -957,7 +957,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
-@@ -1198,7 +1198,7 @@ static struct kobject *exact_match(dev_t
+@@ -1178,7 +1178,7 @@ static struct kobject *exact_match(dev_t
{
struct gendisk *p = data;
*part &= (1 << PARTN_BITS) - 1;
@@ -968,7 +968,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int exact_lock(dev_t dev, void *data)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
-@@ -1477,7 +1477,7 @@ int dm_resume(struct mapped_device *md)
+@@ -1502,7 +1502,7 @@ int dm_resume(struct mapped_device *md)
dm_table_unplug_all(map);
diff --git a/driver/ide-convert-from-class_device-to-device-for-ide-tape.patch b/driver/ide-convert-from-class_device-to-device-for-ide-tape.patch
index 80ddcd67525d72..cc8e18af7d1ab1 100644
--- a/driver/ide-convert-from-class_device-to-device-for-ide-tape.patch
+++ b/driver/ide-convert-from-class_device-to-device-for-ide-tape.patch
@@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
-@@ -4725,10 +4725,8 @@ static void ide_tape_release(struct kref
+@@ -4724,10 +4724,8 @@ static void ide_tape_release(struct kref
drive->dsc_overlap = 0;
drive->driver_data = NULL;
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
idetape_devs[tape->minor] = NULL;
g->private_data = NULL;
put_disk(g);
-@@ -4885,10 +4883,10 @@ static int ide_tape_probe(ide_drive_t *d
+@@ -4884,10 +4882,10 @@ static int ide_tape_probe(ide_drive_t *d
idetape_setup(drive, tape, minor);
diff --git a/driver/nozomi.patch b/driver/nozomi.patch
index 2339173fcaaaaa..57f8a354859910 100644
--- a/driver/nozomi.patch
+++ b/driver/nozomi.patch
@@ -27,7 +27,7 @@ Signed-off-by: Frank Seidel <fseidel@suse.de>
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -390,6 +390,16 @@ config ISTALLION
+@@ -373,6 +373,16 @@ config ISTALLION
To compile this driver as a module, choose M here: the
module will be called istallion.
diff --git a/driver/remove-struct-kobj_type-from-struct-kset.patch b/driver/remove-struct-kobj_type-from-struct-kset.patch
index 7d61cb6e78ccd0..5cb79eeaefe16d 100644
--- a/driver/remove-struct-kobj_type-from-struct-kset.patch
+++ b/driver/remove-struct-kobj_type-from-struct-kset.patch
@@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
media_change_notify_thread);
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
-@@ -739,7 +739,7 @@ static int __init acpi_bus_init(void)
+@@ -746,7 +746,7 @@ static int __init acpi_bus_init(void)
return -ENODEV;
}
@@ -526,7 +526,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
printk(KERN_ERR "sysfs registration failed\n");
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
-@@ -717,8 +717,8 @@ static inline void unregister_fuseblk(vo
+@@ -744,8 +744,8 @@ static inline void unregister_fuseblk(vo
}
#endif
@@ -537,7 +537,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
{
-@@ -768,12 +768,12 @@ static int fuse_sysfs_init(void)
+@@ -795,12 +795,12 @@ static int fuse_sysfs_init(void)
{
int err;
@@ -737,7 +737,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kobject_set_name(&mk->kobj, name);
kobject_init(&mk->kobj);
ret = kobject_add(&mk->kobj);
-@@ -676,8 +679,6 @@ static struct sysfs_ops module_sysfs_ops
+@@ -682,8 +685,6 @@ static struct sysfs_ops module_sysfs_ops
.store = module_attr_store,
};
@@ -746,7 +746,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int uevent_filter(struct kset *kset, struct kobject *kobj)
{
struct kobj_type *ktype = get_ktype(kobj);
-@@ -691,7 +692,7 @@ static struct kset_uevent_ops module_uev
+@@ -697,7 +698,7 @@ static struct kset_uevent_ops module_uev
.filter = uevent_filter,
};
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch
index 41062a194f7e75..3bfb957fe6e285 100644
--- a/driver/sysfs-crash-debugging.patch
+++ b/driver/sysfs-crash-debugging.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
-@@ -416,6 +416,7 @@ void die(const char * str, struct pt_reg
+@@ -396,6 +396,7 @@ void die(const char * str, struct pt_reg
#endif
printk("\n");
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
NOTIFY_STOP) {
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
-@@ -519,6 +519,7 @@ void __kprobes __die(const char * str, s
+@@ -517,6 +517,7 @@ void __kprobes __die(const char * str, s
printk("DEBUG_PAGEALLOC");
#endif
printk("\n");
diff --git a/driver/sysfs-trivial-fix-sysfs_create_file-kerneldoc-spelling-mistake.patch b/driver/sysfs-trivial-fix-sysfs_create_file-kerneldoc-spelling-mistake.patch
deleted file mode 100644
index 993de7e6a3b6f7..00000000000000
--- a/driver/sysfs-trivial-fix-sysfs_create_file-kerneldoc-spelling-mistake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From mail@chrismalley.co.uk Tue Oct 16 02:46:24 2007
-From: Chris Malley <mail@chrismalley.co.uk>
-Date: Tue, 16 Oct 2007 10:37:04 +0100
-Subject: sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
-To: Greg KH <greg@kroah.com>
-Cc: trivial@kernel.org, linux-kernel@vger.kernel.org
-Message-ID: <1192527424.11948.9.camel@feisty>
-
-
-Spelling error in sysfs_create_file kerneldoc.
-
-Signed-off-by: Chris Malley <mail@chrismalley.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- fs/sysfs/file.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/sysfs/file.c
-+++ b/fs/sysfs/file.c
-@@ -540,7 +540,7 @@ int sysfs_add_file(struct sysfs_dirent *
- /**
- * sysfs_create_file - create an attribute file for an object.
- * @kobj: object we're creating for.
-- * @attr: atrribute descriptor.
-+ * @attr: attribute descriptor.
- */
-
- int sysfs_create_file(struct kobject * kobj, const struct attribute * attr)
diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch
index e4fff8b5e973e7..a243b9895280ba 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
-@@ -768,12 +768,21 @@ static void run_init_process(char *init_
+@@ -763,12 +763,21 @@ static void run_init_process(char *init_
kernel_execve(init_filename, argv_init, envp_init);
}