Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Browse source

* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Use kmalloc() instead of vmalloc() for KVM_[GS]ET_MSR
  KVM: MMU: fix conflict access permissions in direct sp

...

This commit is contained in:

Linus Torvalds 2010-07-26 08:18:18 -07:00

parent ab08937400 7a73c0283d

commit 20ba5efb9c

2 changed files with 3 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/kvm/paging_tmpl.h

View file

4

arch/x86/kvm/x86.c

View file