direct-io.hg

changeset 2003:1af4398d2a75

bitkeeper revision 1.1108.33.14 (410a5393v_xG6oYfn6ZwwuVnKJOpbQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
author cl349@freefall.cl.cam.ac.uk
date Fri Jul 30 13:56:35 2004 +0000 (2004-07-30)
parents 0fe3e389d7e0 04278c6bb55d
children 4795aca58a1d
files linux-2.6.7-xen-sparse/arch/xen/i386/mm/init.c linux-2.6.7-xen-sparse/arch/xen/i386/mm/ioremap.c linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/fixmap.h linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/mm/init.c	Fri Jul 30 13:38:41 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/mm/init.c	Fri Jul 30 13:56:35 2004 +0000
     1.3 @@ -499,7 +499,7 @@ void __init paging_init(void)
     1.4  	HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
     1.5  	memset(empty_zero_page, 0, sizeof(empty_zero_page));
     1.6  
     1.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
     1.8 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     1.9  	/* Setup mapping of lower 1st MB */
    1.10  	for (i = 0; i < NR_FIX_ISAMAPS; i++)
    1.11  		set_fixmap_ma(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Jul 30 13:38:41 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Jul 30 13:56:35 2004 +0000
     2.3 @@ -117,9 +117,6 @@ void * __ioremap(unsigned long phys_addr
     2.4  	struct vm_struct * area;
     2.5  	unsigned long offset, last_addr;
     2.6  
     2.7 -	if (!(start_info.flags & SIF_PRIVILEGED))
     2.8 -		return NULL;
     2.9 -
    2.10  	/* Don't allow wraparound or zero size */
    2.11  	last_addr = phys_addr + size - 1;
    2.12  	if (!size || last_addr < phys_addr)
     3.1 --- a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Fri Jul 30 13:38:41 2004 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/fixmap.h	Fri Jul 30 13:56:35 2004 +0000
     3.3 @@ -75,7 +75,7 @@ enum fixed_addresses {
     3.4  	FIX_PCIE_MCFG,
     3.5  #endif
     3.6  	FIX_SHARED_INFO,
     3.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
     3.8 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     3.9  #define NR_FIX_ISAMAPS	256
    3.10  	FIX_ISAMAP_END,
    3.11  	FIX_ISAMAP_BEGIN = FIX_ISAMAP_END + NR_FIX_ISAMAPS - 1,
     4.1 --- a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h	Fri Jul 30 13:38:41 2004 +0000
     4.2 +++ b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h	Fri Jul 30 13:56:35 2004 +0000
     4.3 @@ -123,7 +123,7 @@ extern void bt_iounmap(void *addr, unsig
     4.4   */
     4.5  #define isa_virt_to_bus(_x) BUG() // should be (void *)((FIX_ISAMAP_BEGIN - __virt_to_fix((_x))) << PAGE_SHIFT)
     4.6  #define isa_page_to_bus(_x) BUG()  // page_to_phys(_x)
     4.7 -#ifdef CONFIG_XEN_PHYSDEV_ACCESS
     4.8 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     4.9  #define isa_bus_to_virt(_x) (void *)__fix_to_virt(FIX_ISAMAP_BEGIN - ((_x) >> PAGE_SHIFT))
    4.10  #else
    4.11  #define isa_bus_to_virt(_x) (void *)0L /* XXXcl */