summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-18 13:59:39 -0400
committerAvi Kivity <avi@redhat.com>2012-05-21 17:47:52 +0300
commit322728e55aa7834e2fab2786b76df183c4843a12 (patch)
treeccd2211d5f88d8875155d693a776f68efb03c2d5
parent46a6dd1c87c4ff17202574127daf70cc0bb38d6d (diff)
downloadtalos-obmc-linux-322728e55aa7834e2fab2786b76df183c4843a12.tar.gz
talos-obmc-linux-322728e55aa7834e2fab2786b76df183c4843a12.zip
KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block
There are two functions in this asm-generic file. Looking at other arch which do not use the generic version, these two fcns are within an #ifdef __KERNEL__ block, so make the generic one consistent with those. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--include/asm-generic/kvm_para.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/kvm_para.h b/include/asm-generic/kvm_para.h
index 9a7bbadb688d..5cba37f9eae1 100644
--- a/include/asm-generic/kvm_para.h
+++ b/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
OpenPOWER on IntegriCloud