OSDN Git Service

kvm: fix compilation on aarch64
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 17 May 2019 12:08:53 +0000 (14:08 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 17 May 2019 12:08:53 +0000 (14:08 +0200)
commitc011d23ba046826ccf8c4a4a6c1d01c9ccaa1403
tree635048d5ea11b6df2078f5bd56dc43a6cbf807aa
parentdd53f6102c30a774e0db8e55d49017a38060f6f6
kvm: fix compilation on aarch64

Commit e45adf665a53 ("KVM: Introduce a new guest mapping API", 2019-01-31)
introduced a build failure on aarch64 defconfig:

$ make -j$(nproc) ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- O=out defconfig \
                Image.gz
...
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:
    In function '__kvm_map_gfn':
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1763:9: error:
    implicit declaration of function 'memremap'; did you mean 'memset_p'?
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1763:46: error:
    'MEMREMAP_WB' undeclared (first use in this function)
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:
    In function 'kvm_vcpu_unmap':
../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1795:3: error:
    implicit declaration of function 'memunmap'; did you mean 'vm_munmap'?

because these functions are declared in <linux/io.h> rather than <asm/io.h>,
and the former was being pulled in already on x86 but not on aarch64.

Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c