diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /virt | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e1f2bf8d7b1e..b5af88167613 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -1177,7 +1177,7 @@ static struct file_operations kvm_vcpu_fops = { | |||
| 1177 | */ | 1177 | */ |
| 1178 | static int create_vcpu_fd(struct kvm_vcpu *vcpu) | 1178 | static int create_vcpu_fd(struct kvm_vcpu *vcpu) |
| 1179 | { | 1179 | { |
| 1180 | return anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu, 0); | 1180 | return anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu, O_RDWR); |
| 1181 | } | 1181 | } |
| 1182 | 1182 | ||
| 1183 | /* | 1183 | /* |
| @@ -1638,7 +1638,7 @@ static int kvm_dev_ioctl_create_vm(void) | |||
| 1638 | kvm = kvm_create_vm(); | 1638 | kvm = kvm_create_vm(); |
| 1639 | if (IS_ERR(kvm)) | 1639 | if (IS_ERR(kvm)) |
| 1640 | return PTR_ERR(kvm); | 1640 | return PTR_ERR(kvm); |
| 1641 | fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, 0); | 1641 | fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); |
| 1642 | if (fd < 0) | 1642 | if (fd < 0) |
| 1643 | kvm_put_kvm(kvm); | 1643 | kvm_put_kvm(kvm); |
| 1644 | 1644 | ||