KVM: Move guest pte dirty bit management to the guest pagetable walker

[safe/jmp/linux-2.6] / drivers / uio / uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index acc387d..cc246fa 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -39,7 +39,7 @@ struct uio_device {
 
 static int uio_major;
 static DEFINE_IDR(uio_idr);
-static struct file_operations uio_fops;
+static const struct file_operations uio_fops;
 
 /* UIO class infrastructure */
 static struct uio_class {
@@ -169,10 +169,10 @@ static int uio_dev_add_attributes(struct uio_device *idev)
                map = kzalloc(sizeof(*map), GFP_KERNEL);
                if (!map)
                        goto err;
-               kobject_init_ng(&map->kobj, &map_attr_type);
+               kobject_init(&map->kobj, &map_attr_type);
                map->mem = mem;
                mem->map = map;
-               ret = kobject_add_ng(&map->kobj, idev->map_dir, "map%d", mi);
+               ret = kobject_add(&map->kobj, idev->map_dir, "map%d", mi);
                if (ret)
                        goto err;
                ret = kobject_uevent(&map->kobj, KOBJ_ADD);
@@ -186,9 +186,9 @@ err:
        for (mi--; mi>=0; mi--) {
                mem = &idev->info->mem[mi];
                map = mem->map;
-               kobject_unregister(&map->kobj);
+               kobject_put(&map->kobj);
        }
-       kobject_unregister(idev->map_dir);
+       kobject_put(idev->map_dir);
        sysfs_remove_group(&idev->dev->kobj, &uio_attr_grp);
 err_group:
        dev_err(idev->dev, "error creating sysfs files (%d)\n", ret);
@@ -203,9 +203,9 @@ static void uio_dev_del_attributes(struct uio_device *idev)
                mem = &idev->info->mem[mi];
                if (mem->size == 0)
                        break;
-               kobject_unregister(&mem->map->kobj);
+               kobject_put(&mem->map->kobj);
        }
-       kobject_unregister(idev->map_dir);
+       kobject_put(idev->map_dir);
        sysfs_remove_group(&idev->dev->kobj, &uio_attr_grp);
 }
 
@@ -508,7 +508,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
        }
 }
 
-static struct file_operations uio_fops = {
+static const struct file_operations uio_fops = {
        .owner          = THIS_MODULE,
        .open           = uio_open,
        .release        = uio_release,