WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [IA64] Remove unused variables. init_mm and swapper_pg_d

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [IA64] Remove unused variables. init_mm and swapper_pg_dir.
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 27 Apr 2006 10:32:44 +0000
Delivery-date: Thu, 27 Apr 2006 03:40:39 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID bdb08c9ef3d1905721484c47634a019defb79abb
# Parent  f6e8c269f6afbfd7ea98b419e876e175803ea8e6
[IA64] Remove unused variables. init_mm and swapper_pg_dir.

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>

diff -r f6e8c269f6af -r bdb08c9ef3d1 xen/arch/ia64/linux-xen/head.S
--- a/xen/arch/ia64/linux-xen/head.S    Mon Apr 17 08:46:04 2006 -0600
+++ b/xen/arch/ia64/linux-xen/head.S    Mon Apr 17 08:46:52 2006 -0600
@@ -178,9 +178,11 @@ empty_zero_page:
 empty_zero_page:
        .skip PAGE_SIZE
 
+#ifndef XEN
        .global swapper_pg_dir
 swapper_pg_dir:
        .skip PAGE_SIZE
+#endif
 
 #if defined(XEN) && defined(CONFIG_VIRTUAL_FRAME_TABLE)
        .global frametable_pg_dir
diff -r f6e8c269f6af -r bdb08c9ef3d1 xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c   Mon Apr 17 08:46:04 2006 -0600
+++ b/xen/arch/ia64/linux-xen/setup.c   Mon Apr 17 08:46:52 2006 -0600
@@ -859,8 +859,8 @@ cpu_init (void)
        ia64_setreg(_IA64_REG_CR_DCR,  (  IA64_DCR_DP | IA64_DCR_DK | 
IA64_DCR_DX | IA64_DCR_DR
                                        | IA64_DCR_DA | IA64_DCR_DD | 
IA64_DCR_LC));
 #endif
+#ifndef XEN
        atomic_inc(&init_mm.mm_count);
-#ifndef XEN
        current->active_mm = &init_mm;
 #endif
 #ifdef XEN
diff -r f6e8c269f6af -r bdb08c9ef3d1 xen/arch/ia64/xen/idle0_task.c
--- a/xen/arch/ia64/xen/idle0_task.c    Mon Apr 17 08:46:04 2006 -0600
+++ b/xen/arch/ia64/xen/idle0_task.c    Mon Apr 17 08:46:52 2006 -0600
@@ -1,24 +1,12 @@
 #include <xen/config.h>
 #include <xen/sched.h>
 #include <asm/desc.h>
-
-#define INIT_MM(name) \
-{                                                              \
-       .pgd            = swapper_pg_dir,                       \
-       .mm_users       = ATOMIC_INIT(2),                       \
-       .mm_count       = ATOMIC_INIT(1),                       \
-       .page_table_lock =  SPIN_LOCK_UNLOCKED,                 \
-       .mmlist         = LIST_HEAD_INIT(name.mmlist),          \
-}
 
 #define IDLE_VCPU(_v)               \
 {                                    \
     processor:   0,                  \
     domain:      0                   \
 }
-
-struct mm_struct init_mm = INIT_MM(init_mm);
-EXPORT_SYMBOL(init_mm);
 
 /*
  * Initial task structure.
diff -r f6e8c269f6af -r bdb08c9ef3d1 xen/arch/ia64/xen/ivt.S
--- a/xen/arch/ia64/xen/ivt.S   Mon Apr 17 08:46:04 2006 -0600
+++ b/xen/arch/ia64/xen/ivt.S   Mon Apr 17 08:46:52 2006 -0600
@@ -116,6 +116,9 @@ ia64_ivt:
 // 0x0000 Entry 0 (size 64 bundles) VHPT Translation (8,20,47)
 ENTRY(vhpt_miss)
        DBG_FAULT(0)
+#ifdef XEN
+       FAULT(0)
+#else
        /*
         * The VHPT vector is invoked when the TLB entry for the virtual page 
table
         * is missing.  This happens only as a result of a previous
@@ -141,11 +144,7 @@ ENTRY(vhpt_miss)
        ;;
        rsm psr.dt                              // use physical addressing for 
data
        mov r31=pr                              // save the predicate registers
-#ifdef XEN
-       movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;;
-#else
        mov r19=IA64_KR(PT_BASE)                // get page table base address
-#endif
        shl r21=r16,3                           // shift bit 60 into sign bit
        shr.u r17=r16,61                        // get the region number into 
r17
        ;;
@@ -241,6 +240,7 @@ ENTRY(vhpt_miss)
 
        mov pr=r31,-1                           // restore predicate registers
        rfi
+#endif
 END(vhpt_miss)
 
        .org ia64_ivt+0x400
@@ -625,7 +625,7 @@ ENTRY(nested_dtlb_miss)
        mov b0=r30
        br.sptk.many b0                         // return to continuation point
        ;;
-#endif
+#else
        /*
         * In the absence of kernel bugs, we get here when the virtually mapped 
linear
         * page table is accessed non-speculatively (e.g., in the Dirty-bit, 
Instruction
@@ -649,11 +649,7 @@ ENTRY(nested_dtlb_miss)
         * Clobbered:   b0, r18, r19, r21, psr.dt (cleared)
         */
        rsm psr.dt                              // switch to using physical 
data addressing
-#ifdef XEN
-       movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;;
-#else
        mov r19=IA64_KR(PT_BASE)                // get the page table base 
address
-#endif
        shl r21=r16,3                           // shift bit 60 into sign bit
        ;;
        shr.u r17=r16,61                        // get the region number into 
r17
@@ -688,6 +684,7 @@ ENTRY(nested_dtlb_miss)
 (p6)   br.cond.spnt page_fault
        mov b0=r30
        br.sptk.many b0                         // return to continuation point
+#endif
 END(nested_dtlb_miss)
 
        .org ia64_ivt+0x1800

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [IA64] Remove unused variables. init_mm and swapper_pg_dir., Xen patchbot -unstable <=