ia64/xen-unstable

changeset 355:b2897c7b8bbf

bitkeeper revision 1.163 (3e9406f6hktSYadsvT3oeqb66EeHJg)

Merge cairnwell.research:/home/jws/projects/xen/fixmem/xeno.bk
into cairnwell.research:/home/jws/projects/xen/megaraid/xeno.bk
author jws@cairnwell.research
date Wed Apr 09 11:41:42 2003 +0000 (2003-04-09)
parents 56fce5176629 713997b6b61e
children 1a214a999de6
files BitKeeper/etc/logging_ok xen/arch/i386/ioremap.c xen/drivers/pci/pci.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Wed Apr 09 11:01:19 2003 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Wed Apr 09 11:41:42 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:01:19 2003 +0000
     2.2 +++ b/xen/arch/i386/ioremap.c	Wed Apr 09 11:41:42 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      }
     3.1 --- a/xen/drivers/pci/pci.c	Wed Apr 09 11:01:19 2003 +0000
     3.2 +++ b/xen/drivers/pci/pci.c	Wed Apr 09 11:41:42 2003 +0000
     3.3 @@ -1505,6 +1505,7 @@ unsigned int __devinit pci_do_scan_bus(s
     3.4  {
     3.5  	unsigned int devfn, max, pass;
     3.6  	struct list_head *ln;
     3.7 +	/* XEN MODIFICATION: Allocate 'dev0' on heap to avoid stack overflow. */
     3.8  	struct pci_dev *dev, *dev0;
     3.9  
    3.10  	DBG("Scanning bus %02x\n", bus->number);