Merge tag 'mips_6.3_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-2.6-microblaze.git] / drivers / vfio / container.c

diff --git a/drivers/vfio/container.c b/drivers/vfio/container.c
index 89f10be..d53d08f 100644 (file)
--- a/drivers/vfio/container.c
+++ b/drivers/vfio/container.c
@@ -360,7 +360,7 @@ static int vfio_fops_open(struct inode *inode, struct file *filep)
 {
        struct vfio_container *container;
 
-       container = kzalloc(sizeof(*container), GFP_KERNEL);
+       container = kzalloc(sizeof(*container), GFP_KERNEL_ACCOUNT);
        if (!container)
                return -ENOMEM;
 
@@ -376,11 +376,6 @@ static int vfio_fops_open(struct inode *inode, struct file *filep)
 static int vfio_fops_release(struct inode *inode, struct file *filep)
 {
        struct vfio_container *container = filep->private_data;
-       struct vfio_iommu_driver *driver = container->iommu_driver;
-
-       if (driver && driver->ops->notify)
-               driver->ops->notify(container->iommu_data,
-                                   VFIO_IOMMU_CONTAINER_CLOSE);
 
        filep->private_data = NULL;