projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'powercap', 'pm-clk', 'pm-config' and 'pm-opp'
[cascardo/linux.git]
/
arch
/
ia64
/
kvm
/
kvm-ia64.c
diff --git
a/arch/ia64/kvm/kvm-ia64.c
b/arch/ia64/kvm/kvm-ia64.c
index
ec6b9ac
..
dbe46f4
100644
(file)
--- a/
arch/ia64/kvm/kvm-ia64.c
+++ b/
arch/ia64/kvm/kvm-ia64.c
@@
-1563,7
+1563,7
@@
int kvm_arch_prepare_memory_region(struct kvm *kvm,
for (i = 0; i < npages; i++) {
pfn = gfn_to_pfn(kvm, base_gfn + i);
- if (!kvm_is_
mmio
_pfn(pfn)) {
+ if (!kvm_is_
reserved
_pfn(pfn)) {
kvm_set_pmt_entry(kvm, base_gfn + i,
pfn << PAGE_SHIFT,
_PAGE_AR_RWX | _PAGE_MA_WB);