summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-12 09:25:41 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-12 09:25:41 +0800
commit9ba733e2628196c5f211875122c8fc6de108c19e (patch)
treeb2de66c1cdf54271cfac2e1eee0b1b192b798439 /arch/arm/include
parent138f2c357e124fa8e676e6f27cc986c3ce320130 (diff)
parent5dd612ebfad71f5463d89ff92d1bc307cd286b5d (diff)
Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/kvm_asm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h
index 194c91b610ff..c35c349da069 100644
--- a/arch/arm/include/asm/kvm_asm.h
+++ b/arch/arm/include/asm/kvm_asm.h
@@ -79,6 +79,8 @@
#define rr_lo_hi(a1, a2) a1, a2
#endif
+#define kvm_ksym_ref(kva) (kva)
+
#ifndef __ASSEMBLY__
struct kvm;
struct kvm_vcpu;