aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-03-08 07:18:47 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-08 07:18:47 -0800
commit6f9dddffc65bc711a8983fe0183a9c8a05878c93 (patch)
tree3942c76c8a38d00057ec4ba37133b0f8229b41ae
parent11197e8808b2b58565b86653554acf40da3299dc (diff)
downloadpatches-6f9dddffc65bc711a8983fe0183a9c8a05878c93.tar.gz
driver-core sync with Linus's tree
Diffstat
-rw-r--r--driver-core/driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch10
-rw-r--r--driver-core/driver-core-convert-some-drivers-to-class_attr_string.patch10
-rw-r--r--driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch4
-rw-r--r--driver-core/i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch2
-rw-r--r--driver-core/kobject-constify-struct-kset_uevent_ops.patch4
-rw-r--r--driver-core/sysdev-add-attribute-argument-to-class_attribute-show-store.patch6
-rw-r--r--driver-core/sysfs-use-sysfs_attr_init-and-sysfs_bin_attr_init-on-dynamic-attributes.patch2
7 files changed, 19 insertions, 19 deletions
diff --git a/driver-core/driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch b/driver-core/driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch
index 8004ed9f5b5c2b..e981039e1e3316 100644
--- a/driver-core/driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch
+++ b/driver-core/driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch
@@ -302,7 +302,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
-@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
+@@ -1138,7 +1138,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -313,7 +313,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
-@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
+@@ -346,7 +346,7 @@ bool ioat_cleanup_preamble(struct ioat_c
unsigned long *phys_complete);
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
void ioat_kobject_del(struct ioatdma_device *device);
@@ -669,7 +669,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -2292,7 +2292,7 @@ static void ext4_sb_release(struct kobje
+@@ -2358,7 +2358,7 @@ static void ext4_sb_release(struct kobje
}
@@ -760,7 +760,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
--- a/kernel/params.c
+++ b/kernel/params.c
-@@ -723,7 +723,7 @@ static ssize_t module_attr_store(struct
+@@ -722,7 +722,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -782,7 +782,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -4519,7 +4519,7 @@ static void kmem_cache_release(struct ko
+@@ -4390,7 +4390,7 @@ static void kmem_cache_release(struct ko
kfree(s);
}
diff --git a/driver-core/driver-core-convert-some-drivers-to-class_attr_string.patch b/driver-core/driver-core-convert-some-drivers-to-class_attr_string.patch
index cbed4dfe9f14d0..2979401f523189 100644
--- a/driver-core/driver-core-convert-some-drivers-to-class_attr_string.patch
+++ b/driver-core/driver-core-convert-some-drivers-to-class_attr_string.patch
@@ -144,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
goto out_class;
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
-@@ -707,13 +707,8 @@ static ssize_t show_dev_abi_version(stru
+@@ -691,13 +691,8 @@ static ssize_t show_dev_abi_version(stru
}
static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
@@ -160,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static dev_t overflow_maj;
static DECLARE_BITMAP(overflow_map, IB_UVERBS_MAX_DEVICES);
-@@ -859,7 +854,7 @@ static int __init ib_uverbs_init(void)
+@@ -843,7 +838,7 @@ static int __init ib_uverbs_init(void)
goto out_chrdev;
}
@@ -214,7 +214,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
pr_debug("phantom: module successfully removed\n");
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
-@@ -759,15 +759,8 @@ static struct usb_driver oled_driver = {
+@@ -770,15 +770,8 @@ static struct usb_driver oled_driver = {
.id_table = id_table,
};
@@ -232,7 +232,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int __init asus_oled_init(void)
{
-@@ -779,7 +772,7 @@ static int __init asus_oled_init(void)
+@@ -790,7 +783,7 @@ static int __init asus_oled_init(void)
return PTR_ERR(oled_class);
}
@@ -241,7 +241,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (retval) {
err("Error creating class version file");
goto error;
-@@ -801,7 +794,7 @@ error:
+@@ -812,7 +805,7 @@ error:
static void __exit asus_oled_exit(void)
{
diff --git a/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch b/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch
index 1b0ca0fe0e1717..aa1eafcede2739 100644
--- a/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch
+++ b/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch
@@ -383,7 +383,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
-@@ -2443,7 +2443,7 @@ static int pci_dev_reset(struct pci_dev
+@@ -2486,7 +2486,7 @@ static int pci_dev_reset(struct pci_dev
if (!probe) {
pci_block_user_cfg_access(dev);
/* block PM suspend, driver probe, etc. */
@@ -392,7 +392,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
rc = pci_dev_specific_reset(dev, probe);
-@@ -2465,7 +2465,7 @@ static int pci_dev_reset(struct pci_dev
+@@ -2508,7 +2508,7 @@ static int pci_dev_reset(struct pci_dev
rc = pci_parent_bus_reset(dev, probe);
done:
if (!probe) {
diff --git a/driver-core/i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch b/driver-core/i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch
index 220f04b796a7f9..81cab6c546fd8c 100644
--- a/driver-core/i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch
+++ b/driver-core/i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
-@@ -849,7 +849,7 @@ static const struct i2c_algorithm omap_i
+@@ -850,7 +850,7 @@ static const struct i2c_algorithm omap_i
.functionality = omap_i2c_func,
};
diff --git a/driver-core/kobject-constify-struct-kset_uevent_ops.patch b/driver-core/kobject-constify-struct-kset_uevent_ops.patch
index 736d2cde6f103c..97c992f5985879 100644
--- a/driver-core/kobject-constify-struct-kset_uevent_ops.patch
+++ b/driver-core/kobject-constify-struct-kset_uevent_ops.patch
@@ -123,7 +123,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static inline struct kset *to_kset(struct kobject *kobj)
--- a/kernel/params.c
+++ b/kernel/params.c
-@@ -737,7 +737,7 @@ static int uevent_filter(struct kset *ks
+@@ -736,7 +736,7 @@ static int uevent_filter(struct kset *ks
return 0;
}
@@ -165,7 +165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int retval = 0;
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -4538,7 +4538,7 @@ static int uevent_filter(struct kset *ks
+@@ -4409,7 +4409,7 @@ static int uevent_filter(struct kset *ks
return 0;
}
diff --git a/driver-core/sysdev-add-attribute-argument-to-class_attribute-show-store.patch b/driver-core/sysdev-add-attribute-argument-to-class_attribute-show-store.patch
index 6839fd41a3c2ee..3ceb32490d93b2 100644
--- a/driver-core/sysdev-add-attribute-argument-to-class_attribute-show-store.patch
+++ b/driver-core/sysdev-add-attribute-argument-to-class_attribute-show-store.patch
@@ -281,7 +281,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
-@@ -707,7 +707,9 @@ static ssize_t show_dev_abi_version(stru
+@@ -691,7 +691,9 @@ static ssize_t show_dev_abi_version(stru
}
static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
@@ -305,7 +305,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -87,7 +87,8 @@ DEFINE_MUTEX(ubi_devices_mutex);
+@@ -89,7 +89,8 @@ DEFINE_MUTEX(ubi_devices_mutex);
static DEFINE_SPINLOCK(ubi_devices_lock);
/* "Show" method for files in '/<sysfs>/class/ubi/' */
@@ -338,7 +338,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct net *net = current->nsproxy->net_ns;
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
-@@ -759,7 +759,9 @@ static struct usb_driver oled_driver = {
+@@ -770,7 +770,9 @@ static struct usb_driver oled_driver = {
.id_table = id_table,
};
diff --git a/driver-core/sysfs-use-sysfs_attr_init-and-sysfs_bin_attr_init-on-dynamic-attributes.patch b/driver-core/sysfs-use-sysfs_attr_init-and-sysfs_bin_attr_init-on-dynamic-attributes.patch
index db96e676e4124d..ab4214423ebb71 100644
--- a/driver-core/sysfs-use-sysfs_attr_init-and-sysfs_bin_attr_init-on-dynamic-attributes.patch
+++ b/driver-core/sysfs-use-sysfs_attr_init-and-sysfs_bin_attr_init-on-dynamic-attributes.patch
@@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
attr->attr.mode = S_IRUSR;
--- a/kernel/params.c
+++ b/kernel/params.c
-@@ -517,6 +517,7 @@ static __modinit int add_sysfs_param(str
+@@ -516,6 +516,7 @@ static __modinit int add_sysfs_param(str
new->grp.attrs = attrs;
/* Tack new one on the end. */
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:03:42 +0000