Skip to contentSkip to conversation

KVM: PPC: Move of include to __KERNEL__ section

PATCH In review Alexander Graf 2 participants 2 messages Sep 4, 2010 – Sep 5, 2010 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

Since this issue breaks linux-next, please apply ASAP.

Alex

---
 arch/powerpc/include/asm/kvm_para.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/include/asm/kvm_para.h +2 -1
index d79fd09..50533f9 100644
@@ -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;
Signature · 1 line
1.6.0.2

A message that is not in the archive (sent off-list or not yet received): 1283591368-2984-1-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org

#2 lore raw
Quoted 11 lines · Alexander Graf

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.

---

Since this issue breaks linux-next, please apply ASAP.

Applied (by re-merging kvm-ppc-next, got dropped somehow), thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function