ia64/xen-unstable

changeset 7852:1df8b53bdd37

Change ISA_IO_BASE to fix_to_virt(FIX_ISAMAP_BEGIN). It used to be
PAGE_OFFSET, which was unaltered from vanilla Linux 2.6.12.6 kernels
and caused isa_memcpy_fromio() to not read physical memory from
0xf0000 - 0xfffff correctly.

http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=393

Signed-off-by: Andrew D. Ball <aball@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Nov 16 11:39:38 2005 +0100 (2005-11-16)
parents 80b61bdceb26
children fa99d895bb18
files linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h	Wed Nov 16 11:35:26 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/io.h	Wed Nov 16 11:39:38 2005 +0100
     1.3 @@ -228,7 +228,7 @@ static inline void memcpy_toio(volatile 
     1.4   * used as the IO-area pointer (it can be iounmapped as well, so the
     1.5   * analogy with PCI is quite large):
     1.6   */
     1.7 -#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
     1.8 +#define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
     1.9  
    1.10  #define isa_readb(a) readb(__ISA_IO_base + (a))
    1.11  #define isa_readw(a) readw(__ISA_IO_base + (a))
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h	Wed Nov 16 11:35:26 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/io.h	Wed Nov 16 11:39:38 2005 +0100
     2.3 @@ -298,7 +298,7 @@ void memset_io(volatile void __iomem *a,
     2.4   * used as the IO-area pointer (it can be iounmapped as well, so the
     2.5   * analogy with PCI is quite large):
     2.6   */
     2.7 -#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
     2.8 +#define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
     2.9  
    2.10  #define isa_readb(a) readb(__ISA_IO_base + (a))
    2.11  #define isa_readw(a) readw(__ISA_IO_base + (a))