diff --git a/[refs] b/[refs] index fd441891fa45..f707299ad46d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dea7ca7160f80dd6d31c0bbeb2d871e51b567b6 +refs/heads/master: 33830b4f5bdf2bc21d0c10d38beffdce8edcded7 diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index 25d76a5a9999..9de3b1aba20f 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -302,11 +302,6 @@ static struct kvm *kvm_create_vm(void) return kvm; } -static int kvm_dev_open(struct inode *inode, struct file *filp) -{ - return 0; -} - /* * Free any memory in @free but not in @dont. */ @@ -376,11 +371,6 @@ static void kvm_free_vcpus(struct kvm *kvm) } -static int kvm_dev_release(struct inode *inode, struct file *filp) -{ - return 0; -} - static void kvm_destroy_vm(struct kvm *kvm) { spin_lock(&kvm_lock); @@ -2841,8 +2831,6 @@ static long kvm_dev_ioctl(struct file *filp, } static struct file_operations kvm_chardev_ops = { - .open = kvm_dev_open, - .release = kvm_dev_release, .unlocked_ioctl = kvm_dev_ioctl, .compat_ioctl = kvm_dev_ioctl, };