ia64/xen-unstable

changeset 354:713997b6b61e

bitkeeper revision 1.160.1.5 (3e9404ce1HhGFT4b1H7fFkuDOnvOGw)

Merge
author jws22@gauntlet.cl.cam.ac.uk
date Wed Apr 09 11:31:18 2003 +0000 (2003-04-09)
parents e36f732a6380 8fec4dd2cebb
children b2897c7b8bbf
files BitKeeper/etc/logging_ok xen/arch/i386/ioremap.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Wed Apr 09 11:20:04 2003 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Wed Apr 09 11:31:18 2003 +0000
     1.3 @@ -5,6 +5,7 @@ akw27@plucky.localdomain
     1.4  bd240@boulderdash.cl.cam.ac.uk
     1.5  bd240@labyrinth.cl.cam.ac.uk
     1.6  iap10@labyrinth.cl.cam.ac.uk
     1.7 +jws22@gauntlet.cl.cam.ac.uk
     1.8  jws@cairnwell.research
     1.9  kaf24@labyrinth.cl.cam.ac.uk
    1.10  kaf24@plym.cl.cam.ac.uk
     2.1 --- a/xen/arch/i386/ioremap.c	Wed Apr 09 11:20:04 2003 +0000
     2.2 +++ b/xen/arch/i386/ioremap.c	Wed Apr 09 11:31:18 2003 +0000
     2.3 @@ -50,7 +50,7 @@ void * __ioremap(unsigned long phys_addr
     2.4      if (phys_addr >= 0xA0000 && last_addr < 0x100000)
     2.5          return phys_to_virt(phys_addr);
     2.6  
     2.7 -    if(remap_base + size > IOREMAP_VIRT_END) {
     2.8 +    if(remap_base + size > IOREMAP_VIRT_END-1) {
     2.9        printk("ioremap: going past end of reserved space!\n");
    2.10        return NULL;
    2.11      }