summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2010-09-03 10:22:19 +0200
committerAvi Kivity <avi@redhat.com>2010-10-24 10:52:23 +0200
commit26e673c3003bc8f24bdbbdcb8bc91a78556f579a (patch)
treec18d426385b0d75ef875cd6c9742ed3b6c930e29
parentd1e87c7ee65a20b10faf7e59dbe2cc934c32473b (diff)
KVM: PPC: Move of include to __KERNEL__ section
We have to protect the include for linux/of.h by __KERNEL__ so it doesn't accidently get referenced outside. This patch fixes this and makes the tree compile again. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--arch/powerpc/include/asm/kvm_para.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h
index d79fd091096..50533f9adf4 100644
--- a/arch/powerpc/include/asm/kvm_para.h
+++ b/arch/powerpc/include/asm/kvm_para.h
@@ -21,7 +21,6 @@
#define __POWERPC_KVM_PARA_H__
#include <linux/types.h>
-#include <linux/of.h>
struct kvm_vcpu_arch_shared {
__u64 scratch1;
@@ -54,6 +53,8 @@ struct kvm_vcpu_arch_shared {
#ifdef CONFIG_KVM_GUEST
+#include <linux/of.h>
+
static inline int kvm_para_available(void)
{
struct device_node *hyper_node;