diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
commit | 3872fe83a2fbb7366daa93ca533a22138e2d483e (patch) | |
tree | e9c7c7a4a09a551011286a866235594b76cb73af /arch/arm/include/asm/kvm_host.h | |
parent | 3cc070c1c81948b33ebe2ea68cd39307ce2b312d (diff) | |
parent | 974310d047f3c7788a51d10c8d255eebdb1fa857 (diff) |
Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
-rw-r--r-- | arch/arm/include/asm/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index cc495d799c67..31ee468ce667 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -30,7 +30,6 @@ #define __KVM_HAVE_ARCH_INTC_INITIALIZED #define KVM_USER_MEM_SLOTS 32 -#define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 #define KVM_HAVE_ONE_REG #define KVM_HALT_POLL_NS_DEFAULT 500000 |