ia64/xen-unstable

changeset 16783:d0216f9e87c1

[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@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Thu Jan 17 12:05:43 2008 -0700 (2008-01-17)
parents 4f1f9ee50133
children 6a7fa7dbde56
files xen/arch/ia64/asm-offsets.c xen/arch/ia64/linux-xen/mca_asm.S
line diff
     1.1 --- a/xen/arch/ia64/asm-offsets.c	Thu Jan 17 12:05:43 2008 -0700
     1.2 +++ b/xen/arch/ia64/asm-offsets.c	Thu Jan 17 12:05:43 2008 -0700
     1.3 @@ -253,9 +253,8 @@ void foo(void)
     1.4  	DEFINE(IA64_MCA_CPU_RBSTORE_OFFSET,
     1.5  	       offsetof(struct ia64_mca_cpu, rbstore));
     1.6  
     1.7 -	DEFINE(IA64_DOMAIN_FLAGS_OFFSET,
     1.8 -	       offsetof(struct domain, arch.flags));
     1.9 -
    1.10 +	DEFINE(IA64_VCPU_VHPT_PAGE_OFFSET,
    1.11 +	       offsetof(struct vcpu, arch.vhpt_page));
    1.12  	DEFINE(IA64_VCPU_VHPT_MADDR_OFFSET,
    1.13  	       offsetof(struct vcpu, arch.vhpt_maddr));
    1.14  
     2.1 --- a/xen/arch/ia64/linux-xen/mca_asm.S	Thu Jan 17 12:05:43 2008 -0700
     2.2 +++ b/xen/arch/ia64/linux-xen/mca_asm.S	Thu Jan 17 12:05:43 2008 -0700
     2.3 @@ -196,13 +196,9 @@ 3:	add r4 = r6, r3;;					\
     2.4  	add reg=IA64_KR_CURRENT_OFFSET,reg;;			\
     2.5  	ld8 reg=[reg];;						\
     2.6  	dep tmp=0,reg,60,4;;			/* V to P */	\
     2.7 -	add tmp=IA64_VCPU_DOMAIN_OFFSET,tmp;;			\
     2.8 +	add tmp=IA64_VCPU_VHPT_PAGE_OFFSET,tmp;;		\
     2.9  	ld8 tmp=[tmp];;						\
    2.10 -	dep tmp=0,tmp,60,4;;			/* V to P */	\
    2.11 -	add tmp=IA64_DOMAIN_FLAGS_OFFSET,tmp;;			\
    2.12 -	ld8 tmp=[tmp];;						\
    2.13 -	and tmp=HAS_PERVCPU_VHPT_MASK,tmp;;			\
    2.14 -	cmp.eq p6,p0=tmp,r0;					\
    2.15 +	cmp.eq p6,p0=tmp,r0;	/* v->arch.vhpt_page == NULL */	\
    2.16  (p6)	br.cond.sptk 1f;					\
    2.17  	add reg=IA64_VCPU_VHPT_MADDR_OFFSET,reg;;		\
    2.18  	dep reg=0,reg,60,4;;			/* V to P */	\