---

yaml --- r: 373151 b: refs/heads/master c: 17b1e31 h: refs/heads/master i: 373149: 47b81b7 373147: 3879dd5 373143: 0d6fd31 373135: 69d8e3a 373119: 5ff3cb2 v: v3
git-mirror · Apr 29, 2013 · 900cc56 · 900cc56
1 parent 4e9f1d8
commit 900cc56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d157f4a5155f4fbd0d1da66b3d2f504c13bd194d
+refs/heads/master: 17b1e31f9201fc102ee3ddd409988e47753e22f9
diff --git a/trunk/arch/arm/include/asm/kvm_host.h b/trunk/arch/arm/include/asm/kvm_host.h
@@ -214,6 +214,11 @@ static inline void __cpu_init_hyp_mode(unsigned long long boot_pgd_ptr,
 	kvm_call_hyp((void*)hyp_stack_ptr, vector_ptr, pgd_ptr);
 }
 
+static inline int kvm_arch_dev_ioctl_check_extension(long ext)
+{
+	return 0;
+}
+
 int kvm_perf_init(void);
 int kvm_perf_teardown(void);
 

diff --git a/trunk/arch/arm/kvm/arm.c b/trunk/arch/arm/kvm/arm.c
@@ -206,7 +206,7 @@ int kvm_dev_ioctl_check_extension(long ext)
 		r = KVM_MAX_VCPUS;
 		break;
 	default:
-		r = 0;
+		r = kvm_arch_dev_ioctl_check_extension(ext);
 		break;
 	}
 	return r;