ia64/xen-unstable

changeset 3197:8cd794f236b8

bitkeeper revision 1.1159.187.33 (41ab10f0GLXR1qCvGRT8TTbIpm5j7A)

Fix ioremap() to only expect the lowmem ISA region to be fixmap()ed
in privileged builds.
author kaf24@scramble.cl.cam.ac.uk
date Mon Nov 29 12:07:12 2004 +0000 (2004-11-29)
parents 9c26a1d2b093
children b8428734f8c7 74564ac24cb8
files linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c	Mon Nov 29 10:09:43 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/mm/ioremap.c	Mon Nov 29 12:07:12 2004 +0000
     1.3 @@ -154,11 +154,13 @@ void __iomem * __ioremap(unsigned long p
     1.4  	if (!size || last_addr < phys_addr)
     1.5  		return NULL;
     1.6  
     1.7 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     1.8  	/*
     1.9  	 * Don't remap the low PCI/ISA area, it's always mapped..
    1.10  	 */
    1.11  	if (phys_addr >= 0x0 && last_addr < 0x100000)
    1.12  		return isa_bus_to_virt(phys_addr);
    1.13 +#endif
    1.14  
    1.15  	/*
    1.16  	 * Don't allow anybody to remap normal RAM that we're using..
    1.17 @@ -287,11 +289,13 @@ void __init *bt_ioremap(unsigned long ph
    1.18  	if (!size || last_addr < phys_addr)
    1.19  		return NULL;
    1.20  
    1.21 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.22  	/*
    1.23  	 * Don't remap the low PCI/ISA area, it's always mapped..
    1.24  	 */
    1.25  	if (phys_addr >= 0x0 && last_addr < 0x100000)
    1.26  		return isa_bus_to_virt(phys_addr);
    1.27 +#endif
    1.28  
    1.29  	/*
    1.30  	 * Mappings have to be page-aligned