>Post a replacement to 2_misc_device_to_2_6_19.patch, we'll test.
I did not test this patch, but you can try replacing the contents of
the 2_misc_device_to_2_6_19.patch with the changes below. (It's
possible that this may lead to some conflict further down in the patch
chain...) The function prototype for show_abi_version changed between
2.6.20 to 2.6.19; this was the missing piece in the original backport
patch. I would have expected a build warning for this.
Signed-off-by: Sean Hefty <[EMAIL PROTECTED]>
---
--- ofa_kernel-1.2/drivers/infiniband/core/ucma.c 2007-03-08
12:11:37.000000000 -0800
+++ b/drivers/infiniband/core/ucma.c 2007-03-08 12:13:13.000000000 -0800
@@ -847,13 +847,11 @@ static struct miscdevice ucma_misc = {
.fops = &ucma_fops,
};
-static ssize_t show_abi_version(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t show_abi_version(struct class_device *class_dev, char *buf)
{
return sprintf(buf, "%d\n", RDMA_USER_CM_ABI_VERSION);
}
-static DEVICE_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+static CLASS_DEVICE_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
static int __init ucma_init(void)
{
@@ -863,7 +861,8 @@ static int __init ucma_init(void)
if (ret)
return ret;
- ret = device_create_file(ucma_misc.this_device, &dev_attr_abi_version);
+ ret = class_device_create_file(ucma_misc.class,
+ &class_device_attr_abi_version);
if (ret) {
printk(KERN_ERR "rdma_ucm: couldn't create abi_version attr\n");
goto err;
@@ -876,7 +875,8 @@ err:
static void __exit ucma_cleanup(void)
{
- device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
+ class_device_remove_file(ucma_misc.class,
+ &class_device_attr_abi_version);
misc_deregister(&ucma_misc);
idr_destroy(&ctx_idr);
}
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
