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 <[email protected]> Signed-off-by: Alexander Graf <[email protected]> --- 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(-) diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h index d79fd09..50533f9 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; -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
