diff --git a/[refs] b/[refs]
index 1ee39164c024..4b79f032fed4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46a6dd1c87c4ff17202574127daf70cc0bb38d6d
+refs/heads/master: 322728e55aa7834e2fab2786b76df183c4843a12
diff --git a/trunk/include/asm-generic/kvm_para.h b/trunk/include/asm-generic/kvm_para.h
index 9a7bbadb688d..5cba37f9eae1 100644
--- a/trunk/include/asm-generic/kvm_para.h
+++ b/trunk/include/asm-generic/kvm_para.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_GENERIC_KVM_PARA_H
 #define _ASM_GENERIC_KVM_PARA_H
 
+#ifdef __KERNEL__
 
 /*
  * This function is used by architectures that support kvm to avoid issuing
@@ -16,4 +17,6 @@ static inline unsigned int kvm_arch_para_features(void)
 	return 0;
 }
 
+#endif	/* _KERNEL__ */
+
 #endif