ukui/kernel
0
0
Fork 0
mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Powerpc KVM work is based on a commit after rc4.

Browse Source 
Merging master into next to satisfy the dependencies.

Conflicts:
	arch/arm/kvm/reset.c
This commit is contained in:
Gleb Natapov
2013-10-17 17:04:47 +03:00
parent d570142674 34ec4de42b
commit 13acfd5715
695 changed files with 6243 additions and 4051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virt/kvm/kvm_main.c
+4 -2
View File
@@ -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)