From 900cc56618b15a28b0ccf6094659d42a91e08861 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Mon, 8 Apr 2013 16:47:18 +0100
Subject: [PATCH] --- yaml --- r: 373151 b: refs/heads/master c:
 17b1e31f9201fc102ee3ddd409988e47753e22f9 h: refs/heads/master i:   373149:
 47b81b7016b88f410c60951039d2fdde11abcf9a   373147:
 3879dd51ae742d059288288d33d63e47406c409d   373143:
 0d6fd318d801b943da87a642799ae651b2795224   373135:
 69d8e3a2baff5998a0920e94a497dd4e92ae51de   373119:
 5ff3cb243d31078696c14e3d6a9ba0c760105d0e v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/include/asm/kvm_host.h | 5 +++++
 trunk/arch/arm/kvm/arm.c              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77dce9aeb39c..4cb83f719f42 100644
--- 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
index 6c2a35da867e..dcfcbf59fceb 100644
--- 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
index 6ea2aed0d29f..cc67cafc5b87 100644
--- 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;