diff options
| -rw-r--r-- | driver/block-device.patch | 2 | ||||
| -rw-r--r-- | driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch index 6165b737e2cfb1..7d741dcc398359 100644 --- a/driver/block-device.patch +++ b/driver/block-device.patch @@ -1550,7 +1550,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #ifdef CONFIG_BLOCK -+#define kobj_to_dev(kobj) container_of(kobj, struct device, kobj) ++#define kobj_to_dev(k) container_of(k, struct device, kobj) +#define dev_to_disk(device) container_of(device, struct gendisk, dev) +#define dev_to_part(device) container_of(device, struct hd_struct, dev) + diff --git a/driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch b/driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch index e66441368cbc86..6620cee7ebd67a 100644 --- a/driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch +++ b/driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -/* Required to back map a kobject to its containing object */ -#define from_kobj(kobj) container_of(kobj, struct hvcs_struct, kobj) +/* Required to back map a kref to its containing object */ -+#define from_kref(kref) container_of(kref, struct hvcs_struct, kref) ++#define from_kref(k) container_of(k, struct hvcs_struct, kref) static struct list_head hvcs_structs = LIST_HEAD_INIT(hvcs_structs); static DEFINE_SPINLOCK(hvcs_structs_lock); |