From 873d3d88e5cccf0b90d6e99fe38f572fd2187d34 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 29 Jul 2010 14:47:53 +0200 Subject: [PATCH] --- yaml --- r: 215687 b: refs/heads/master c: beb03f14da9ceff76ff08cbb8af064b52dc21f7e h: refs/heads/master i: 215685: 2406e88f62b44227ae821e47f285403c54931ba4 215683: b0426658eccf6c6485c5abff6b52d8284173b74c 215679: 54b6497ca4387999c09024318506c637b55b5ffa v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/kvm_host.h | 2 ++ trunk/include/linux/kvm_para.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index adbe3e98ca7d..f388a76712b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28e83b4fa7f8bd114940fa933ac8cbe80969eba2 +refs/heads/master: beb03f14da9ceff76ff08cbb8af064b52dc21f7e diff --git a/trunk/arch/powerpc/include/asm/kvm_host.h b/trunk/arch/powerpc/include/asm/kvm_host.h index 1674da8134cb..e1da77579e65 100644 --- a/trunk/arch/powerpc/include/asm/kvm_host.h +++ b/trunk/arch/powerpc/include/asm/kvm_host.h @@ -287,6 +287,8 @@ struct kvm_vcpu_arch { u64 dec_jiffies; unsigned long pending_exceptions; struct kvm_vcpu_arch_shared *shared; + unsigned long magic_page_pa; /* phys addr to map the magic page to */ + unsigned long magic_page_ea; /* effect. addr to map the magic page to */ #ifdef CONFIG_PPC_BOOK3S struct hlist_head hpte_hash_pte[HPTEG_HASH_NUM_PTE]; diff --git a/trunk/include/linux/kvm_para.h b/trunk/include/linux/kvm_para.h index 3b8080e1843f..ac2015a25012 100644 --- a/trunk/include/linux/kvm_para.h +++ b/trunk/include/linux/kvm_para.h @@ -18,6 +18,7 @@ #define KVM_HC_VAPIC_POLL_IRQ 1 #define KVM_HC_MMU_OP 2 #define KVM_HC_FEATURES 3 +#define KVM_HC_PPC_MAP_MAGIC_PAGE 4 /* * hypercalls use architecture specific