summaryrefslogtreecommitdiffstats
path: root/drivers/kvm/vmx.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-05-08 11:34:07 +0300
committerAvi Kivity <avi@qumranet.com>2007-07-16 12:05:41 +0300
commitcd0536d7cb4d5d5c5aa37ccd3edd71c4b0524add (patch)
treeb68b65aa2abdd5a7b7b7085105e4edb51a2255e3 /drivers/kvm/vmx.c
parent653e3108b7d6097d25089d25ab4e99bc58b28962 (diff)
downloadop-kernel-dev-cd0536d7cb4d5d5c5aa37ccd3edd71c4b0524add.zip
op-kernel-dev-cd0536d7cb4d5d5c5aa37ccd3edd71c4b0524add.tar.gz
KVM: Fix vmx I/O bitmap initialization on highmem systems
kunmap() expects a struct page, not a virtual address. Fixes an oops loading kvm-intel.ko on i386 with CONFIG_HIGHMEM. Thanks to Michael Ivanov <deruhu@peterstar.ru> for reporting. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/vmx.c')
-rw-r--r--drivers/kvm/vmx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index e39ebe0..34171d9 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -2274,11 +2274,11 @@ static int __init vmx_init(void)
iova = kmap(vmx_io_bitmap_a);
memset(iova, 0xff, PAGE_SIZE);
clear_bit(0x80, iova);
- kunmap(iova);
+ kunmap(vmx_io_bitmap_a);
iova = kmap(vmx_io_bitmap_b);
memset(iova, 0xff, PAGE_SIZE);
- kunmap(iova);
+ kunmap(vmx_io_bitmap_b);
r = kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
if (r)
OpenPOWER on IntegriCloud