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