Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[~andy/linux] / arch / powerpc / include / asm / kvm_book3s_asm.h

diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h
index af73469530e6348b62b701b88ec82599a6d90045..1f2f5b6156bd01e6aa3a3752d4899f2ab0175f53 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -76,6 +76,7 @@ struct kvmppc_host_state {
        ulong scratch1;
        u8 in_guest;
        u8 restore_hid5;
+       u8 napping;
 
 #ifdef CONFIG_KVM_BOOK3S_64_HV
        struct kvm_vcpu *kvm_vcpu;