ia64/xen-unstable

changeset 611:2302a65a8f7a

bitkeeper revision 1.342 (3f1153a1RLTmwr7Jo9U1gUChA4e0Jw)

cleanup
author iap10@labyrinth.cl.cam.ac.uk
date Sun Jul 13 12:42:09 2003 +0000 (2003-07-13)
parents cda951fc1bef
children 729e25262c44
files xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
line diff
     1.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c	Sun Jul 13 09:04:34 2003 +0000
     1.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c	Sun Jul 13 12:42:09 2003 +0000
     1.3 @@ -175,6 +175,11 @@ void iounmap(void *addr)
     1.4      vfree((void *)((unsigned long)addr & PAGE_MASK));
     1.5  }
     1.6  
     1.7 +/* implementation of boot time ioremap for purpose of provising access
     1.8 +to the vga console for privileged domains. Unlike boot time ioremap on 
     1.9 +other architectures, ours is permanent and not reclaimed when then vmalloc
    1.10 +infrastructure is started */
    1.11 +
    1.12  void __init *bt_ioremap(unsigned long machine_addr, unsigned long size)
    1.13  {
    1.14          unsigned long offset, last_addr;
    1.15 @@ -206,25 +211,17 @@ void __init *bt_ioremap(unsigned long ma
    1.16          idx = FIX_BTMAP_BEGIN;
    1.17          while (nrpages > 0) {
    1.18                  set_fixmap(idx, machine_addr);
    1.19 -
    1.20 -		//unsigned long address = __fix_to_virt(idx);
    1.21 -		
    1.22 -
    1.23 -
    1.24 -//direct_set_pte(address, direct_mk_pte_phys(machine_addr, PAGE_KERNEL_NOCACHE));
    1.25 -
    1.26                  machine_addr += PAGE_SIZE;
    1.27                  --idx;
    1.28                  --nrpages;
    1.29          }
    1.30  
    1.31 -flush_tlb_all();
    1.32 +	flush_tlb_all();
    1.33  
    1.34          return (void*) (offset + fix_to_virt(FIX_BTMAP_BEGIN));
    1.35  }
    1.36  
    1.37  
    1.38  #if 0 /* We don't support these functions. They shouldn't be required. */
    1.39 -void __init *bt_ioremap(unsigned long machine_addr, unsigned long size) {}
    1.40  void __init bt_iounmap(void *addr, unsigned long size) {}
    1.41  #endif
     2.1 --- a/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h	Sun Jul 13 09:04:34 2003 +0000
     2.2 +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h	Sun Jul 13 12:42:09 2003 +0000
     2.3 @@ -50,7 +50,7 @@ enum fixed_addresses {
     2.4  #define NR_FIX_BTMAPS   8  /* 32KB For the Dom0 VGA Console */
     2.5          FIX_BTMAP_END,
     2.6          FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1,
     2.7 -
     2.8 +	/* our bt_ioremap is permenant unlike other architectures */
     2.9  	__end_of_permanent_fixed_addresses,
    2.10  	__end_of_fixed_addresses = __end_of_permanent_fixed_addresses
    2.11  };