[Xen-changelog] [xen-unstable] [IA64] domheap: Don't refer struct domain from GET_VA_VCPU_VHPT_MADDR()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1200596743 25200
# Node ID d0216f9e87c1d9b99563c5a5381915d8c2cda47f
# Parent  4f1f9ee5013302ddc224625661a93a86b8c30223
[IA64] domheap: Don't refer struct domain from GET_VA_VCPU_VHPT_MADDR()

So far, current->domain->arch.flags.has_pervcpu_vhpt is used.
Instead use current->arch.vhpt_page.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/asm-offsets.c       |    5 ++---
 xen/arch/ia64/linux-xen/mca_asm.S |    8 ++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff -r 4f1f9ee50133 -r d0216f9e87c1 xen/arch/ia64/asm-offsets.c
--- a/xen/arch/ia64/asm-offsets.c       Thu Jan 17 12:05:43 2008 -0700
+++ b/xen/arch/ia64/asm-offsets.c       Thu Jan 17 12:05:43 2008 -0700
@@ -253,9 +253,8 @@ void foo(void)
        DEFINE(IA64_MCA_CPU_RBSTORE_OFFSET,
               offsetof(struct ia64_mca_cpu, rbstore));
 
-       DEFINE(IA64_DOMAIN_FLAGS_OFFSET,
-              offsetof(struct domain, arch.flags));
-
+       DEFINE(IA64_VCPU_VHPT_PAGE_OFFSET,
+              offsetof(struct vcpu, arch.vhpt_page));
        DEFINE(IA64_VCPU_VHPT_MADDR_OFFSET,
               offsetof(struct vcpu, arch.vhpt_maddr));
 
diff -r 4f1f9ee50133 -r d0216f9e87c1 xen/arch/ia64/linux-xen/mca_asm.S
--- a/xen/arch/ia64/linux-xen/mca_asm.S Thu Jan 17 12:05:43 2008 -0700
+++ b/xen/arch/ia64/linux-xen/mca_asm.S Thu Jan 17 12:05:43 2008 -0700
@@ -196,13 +196,9 @@ 3: add r4 = r6, r3;;                                       
\
        add reg=IA64_KR_CURRENT_OFFSET,reg;;                    \
        ld8 reg=[reg];;                                         \
        dep tmp=0,reg,60,4;;                    /* V to P */    \
-       add tmp=IA64_VCPU_DOMAIN_OFFSET,tmp;;                   \
+       add tmp=IA64_VCPU_VHPT_PAGE_OFFSET,tmp;;                \
        ld8 tmp=[tmp];;                                         \
-       dep tmp=0,tmp,60,4;;                    /* V to P */    \
-       add tmp=IA64_DOMAIN_FLAGS_OFFSET,tmp;;                  \
-       ld8 tmp=[tmp];;                                         \
-       and tmp=HAS_PERVCPU_VHPT_MASK,tmp;;                     \
-       cmp.eq p6,p0=tmp,r0;                                    \
+       cmp.eq p6,p0=tmp,r0;    /* v->arch.vhpt_page == NULL */ \
 (p6)   br.cond.sptk 1f;                                        \
        add reg=IA64_VCPU_VHPT_MADDR_OFFSET,reg;;               \
        dep reg=0,reg,60,4;;                    /* V to P */    \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog