[Xen-ia64-devel] remove CONFIG_XEN for those already embraced in xen directory

["Dong, Eddie" <eddie.dong@xxxxxxxxx>]

Xen specific directories are only compiled with Xen, keeping CONFIG_XEN
in each file is redudant.



diff --git a/arch/ia64/xen/xen_pv_ops.c b/arch/ia64/xen/xen_pv_ops.c
index 93a5c64..0c978e8 100644
--- a/arch/ia64/xen/xen_pv_ops.c
+++ b/arch/ia64/xen/xen_pv_ops.c
@@ -210,10 +210,8 @@ static void __init
 xen_post_paging_init(void)
 {
 #ifdef notyet /* XXX: notyet dma api paravirtualization*/
-#ifdef CONFIG_XEN
        xen_contiguous_bitmap_init(max_pfn);
 #endif
-#endif
 }
 
 static void __init
diff --git a/arch/ia64/xen/xenpal.S b/arch/ia64/xen/xenpal.S
index 0e05210..57dca95 100644
--- a/arch/ia64/xen/xenpal.S
+++ b/arch/ia64/xen/xenpal.S
@@ -13,9 +13,7 @@
 #include <asm/paravirt_nop.h>
 
 GLOBAL_ENTRY(xen_pal_call_static)
-#ifdef CONFIG_XEN
        BR_IF_NATIVE(native_pal_call_static, r22, p7)
-#endif
        .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS,
ASM_UNW_PRLG_GRSAVE(5)
        alloc loc1 = ar.pfs,4,5,0,0
        movl loc2 = pal_entry_point
@@ -30,21 +28,16 @@ GLOBAL_ENTRY(xen_pal_call_static)
        mov loc4=ar.rsc                 // save RSE configuration
        ;;
        mov ar.rsc=0                    // put RSE in enforced lazy, LE
mode
-#ifdef CONFIG_XEN
        mov r9 = r8
        XEN_HYPER_GET_PSR
        ;;
        mov loc3 = r8
        mov r8 = r9
        ;;
-#else
-       mov loc3 = psr
-#endif
        mov loc0 = rp
        .body
        mov r30 = in2
 
-#ifdef CONFIG_XEN
        // this is low priority for paravirtualization, but is called
        // from the idle loop so confuses privop counting
        movl r31=XSI_PSR_I_ADDR
@@ -57,13 +50,6 @@ GLOBAL_ENTRY(xen_pal_call_static)
        mov r31 = in3
        mov b7 = loc2
        ;;
-#else
-       mov r31 = in3
-       mov b7 = loc2
-
-(p7)   rsm psr.i
-       ;;
-#endif
        mov rp = r8
        br.cond.sptk.many b7
 1:     mov psr.l = loc3

Attachment: x3
Description: x3

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