From bda7ee857459e724ab970bd5ae52dd018430d62d Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri, 20 Apr 2012 18:21:46 -0300
Subject: [PATCH] --- yaml --- r: 307871 b: refs/heads/master c:
 1f15d10984c854e077da5aa1a23f901496b49773 h: refs/heads/master i:   307869:
 774d643c5335d9c85c3b1945bb28b1565ddc3c2b   307867:
 f30e6cc891f849b69ad0a1f99b8ec20b16fb3af4   307863:
 3fe1a9a23f34b27f7f47011df813d050e4a72365   307855:
 12fe96315397d4877df990c69449b593b40c8dde   307839:
 ce8b474901dbc46378499ee827562ec1c10ec41b v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-generic/kvm_para.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b7b2e46c3fc..ccb3f064a32c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8281715b4109b5ee26032ff7b77c0d575c4150f7
+refs/heads/master: 1f15d10984c854e077da5aa1a23f901496b49773
diff --git a/trunk/include/asm-generic/kvm_para.h b/trunk/include/asm-generic/kvm_para.h
index 05ef7e705939..9a7bbadb688d 100644
--- a/trunk/include/asm-generic/kvm_para.h
+++ b/trunk/include/asm-generic/kvm_para.h
@@ -11,4 +11,9 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 	return false;
 }
 
+static inline unsigned int kvm_arch_para_features(void)
+{
+	return 0;
+}
+
 #endif