mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c
This commit is contained in:
commit
13acfd5715
695 changed files with 6235 additions and 4043 deletions
|
|
@ -1065,10 +1065,12 @@ EXPORT_SYMBOL_GPL(gfn_to_hva);
|
|||
unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable)
|
||||
{
|
||||
struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);
|
||||
if (writable)
|
||||
unsigned long hva = __gfn_to_hva_many(slot, gfn, NULL, false);
|
||||
|
||||
if (!kvm_is_error_hva(hva) && writable)
|
||||
*writable = !memslot_is_readonly(slot);
|
||||
|
||||
return __gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL, false);
|
||||
return hva;
|
||||
}
|
||||
|
||||
static int kvm_read_hva(void *data, void __user *hva, int len)
|
||||
|
|
|
|||
Loading…
Reference in a new issue