Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / arch / arm64 / include / asm / kvm_asm.h

diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index 226f49d..eb7490d 100644 (file)
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -26,7 +26,13 @@
 #define KVM_ARM64_DEBUG_DIRTY_SHIFT    0
 #define KVM_ARM64_DEBUG_DIRTY          (1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)
 
-#define kvm_ksym_ref(sym)              phys_to_virt((u64)&sym - kimage_voffset)
+#define kvm_ksym_ref(sym)                                              \
+       ({                                                              \
+               void *val = &sym;                                       \
+               if (!is_kernel_in_hyp_mode())                           \
+                       val = phys_to_virt((u64)&sym - kimage_voffset); \
+               val;                                                    \
+        })
 
 #ifndef __ASSEMBLY__
 struct kvm;