ia64/xen-unstable

changeset 9690:bdb08c9ef3d1

[IA64] Remove unused variables. init_mm and swapper_pg_dir.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Mon Apr 17 08:46:52 2006 -0600 (2006-04-17)
parents f6e8c269f6af
children 4ed269e73e95
files xen/arch/ia64/linux-xen/head.S xen/arch/ia64/linux-xen/setup.c xen/arch/ia64/xen/idle0_task.c xen/arch/ia64/xen/ivt.S
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/head.S	Mon Apr 17 08:46:04 2006 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/head.S	Mon Apr 17 08:46:52 2006 -0600
     1.3 @@ -178,9 +178,11 @@ RestRR:											\
     1.4  empty_zero_page:
     1.5  	.skip PAGE_SIZE
     1.6  
     1.7 +#ifndef XEN
     1.8  	.global swapper_pg_dir
     1.9  swapper_pg_dir:
    1.10  	.skip PAGE_SIZE
    1.11 +#endif
    1.12  
    1.13  #if defined(XEN) && defined(CONFIG_VIRTUAL_FRAME_TABLE)
    1.14  	.global frametable_pg_dir
     2.1 --- a/xen/arch/ia64/linux-xen/setup.c	Mon Apr 17 08:46:04 2006 -0600
     2.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Mon Apr 17 08:46:52 2006 -0600
     2.3 @@ -859,8 +859,8 @@ cpu_init (void)
     2.4  	ia64_setreg(_IA64_REG_CR_DCR,  (  IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR
     2.5  					| IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
     2.6  #endif
     2.7 +#ifndef XEN
     2.8  	atomic_inc(&init_mm.mm_count);
     2.9 -#ifndef XEN
    2.10  	current->active_mm = &init_mm;
    2.11  #endif
    2.12  #ifdef XEN
     3.1 --- a/xen/arch/ia64/xen/idle0_task.c	Mon Apr 17 08:46:04 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/idle0_task.c	Mon Apr 17 08:46:52 2006 -0600
     3.3 @@ -2,24 +2,12 @@
     3.4  #include <xen/sched.h>
     3.5  #include <asm/desc.h>
     3.6  
     3.7 -#define INIT_MM(name) \
     3.8 -{			 					\
     3.9 -	.pgd		= swapper_pg_dir, 			\
    3.10 -	.mm_users	= ATOMIC_INIT(2), 			\
    3.11 -	.mm_count	= ATOMIC_INIT(1), 			\
    3.12 -	.page_table_lock =  SPIN_LOCK_UNLOCKED, 		\
    3.13 -	.mmlist		= LIST_HEAD_INIT(name.mmlist),		\
    3.14 -}
    3.15 -
    3.16  #define IDLE_VCPU(_v)    	     \
    3.17  {                                    \
    3.18      processor:   0,                  \
    3.19      domain:      0                   \
    3.20  }
    3.21  
    3.22 -struct mm_struct init_mm = INIT_MM(init_mm);
    3.23 -EXPORT_SYMBOL(init_mm);
    3.24 -
    3.25  /*
    3.26   * Initial task structure.
    3.27   *
     4.1 --- a/xen/arch/ia64/xen/ivt.S	Mon Apr 17 08:46:04 2006 -0600
     4.2 +++ b/xen/arch/ia64/xen/ivt.S	Mon Apr 17 08:46:52 2006 -0600
     4.3 @@ -116,6 +116,9 @@ ia64_ivt:
     4.4  // 0x0000 Entry 0 (size 64 bundles) VHPT Translation (8,20,47)
     4.5  ENTRY(vhpt_miss)
     4.6  	DBG_FAULT(0)
     4.7 +#ifdef XEN
     4.8 +	FAULT(0)
     4.9 +#else
    4.10  	/*
    4.11  	 * The VHPT vector is invoked when the TLB entry for the virtual page table
    4.12  	 * is missing.  This happens only as a result of a previous
    4.13 @@ -141,11 +144,7 @@ ENTRY(vhpt_miss)
    4.14  	;;
    4.15  	rsm psr.dt				// use physical addressing for data
    4.16  	mov r31=pr				// save the predicate registers
    4.17 -#ifdef XEN
    4.18 -	movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;;
    4.19 -#else
    4.20  	mov r19=IA64_KR(PT_BASE)		// get page table base address
    4.21 -#endif
    4.22  	shl r21=r16,3				// shift bit 60 into sign bit
    4.23  	shr.u r17=r16,61			// get the region number into r17
    4.24  	;;
    4.25 @@ -241,6 +240,7 @@ ENTRY(vhpt_miss)
    4.26  
    4.27  	mov pr=r31,-1				// restore predicate registers
    4.28  	rfi
    4.29 +#endif
    4.30  END(vhpt_miss)
    4.31  
    4.32  	.org ia64_ivt+0x400
    4.33 @@ -625,7 +625,7 @@ ENTRY(nested_dtlb_miss)
    4.34  	mov b0=r30
    4.35  	br.sptk.many b0				// return to continuation point
    4.36  	;;
    4.37 -#endif
    4.38 +#else
    4.39  	/*
    4.40  	 * In the absence of kernel bugs, we get here when the virtually mapped linear
    4.41  	 * page table is accessed non-speculatively (e.g., in the Dirty-bit, Instruction
    4.42 @@ -649,11 +649,7 @@ ENTRY(nested_dtlb_miss)
    4.43  	 * Clobbered:	b0, r18, r19, r21, psr.dt (cleared)
    4.44  	 */
    4.45  	rsm psr.dt				// switch to using physical data addressing
    4.46 -#ifdef XEN
    4.47 -	movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;;
    4.48 -#else
    4.49  	mov r19=IA64_KR(PT_BASE)		// get the page table base address
    4.50 -#endif
    4.51  	shl r21=r16,3				// shift bit 60 into sign bit
    4.52  	;;
    4.53  	shr.u r17=r16,61			// get the region number into r17
    4.54 @@ -688,6 +684,7 @@ ENTRY(nested_dtlb_miss)
    4.55  (p6)	br.cond.spnt page_fault
    4.56  	mov b0=r30
    4.57  	br.sptk.many b0				// return to continuation point
    4.58 +#endif
    4.59  END(nested_dtlb_miss)
    4.60  
    4.61  	.org ia64_ivt+0x1800