ia64/xen-unstable

changeset 1331:975d97ad562f

bitkeeper revision 1.879.1.7 (4092794b4ICZMqVU5M2Y8Y-gxy4XLw)

Fix Mark's PCI updates so that my test system (Dell PE2650) still
works with aacraid driver.
author kaf24@scramble.cl.cam.ac.uk
date Fri Apr 30 16:05:31 2004 +0000 (2004-04-30)
parents c31e790d45bd
children 60e0bd84bf4d
files xen/common/physdev.c
line diff
     1.1 --- a/xen/common/physdev.c	Fri Apr 30 15:46:01 2004 +0000
     1.2 +++ b/xen/common/physdev.c	Fri Apr 30 16:05:31 2004 +0000
     1.3 @@ -417,7 +417,7 @@ static long pci_cfgreg_read(int bus, int
     1.4           * all 1s.  In this case the domain has no read access, which should
     1.5           * also look like the device is non-existent. */
     1.6          *val = 0xFFFFFFFF;
     1.7 -        return 0;
     1.8 +        return ret; /* KAF: error return seems to matter on my test machine. */
     1.9      }
    1.10  
    1.11      /* Fake out read requests for some registers. */
    1.12 @@ -637,7 +637,6 @@ void physdev_init_dom0(struct task_struc
    1.13              /* Skip bridges and other peculiarities for now. */
    1.14              if ( dev->hdr_type != PCI_HEADER_TYPE_NORMAL )
    1.15                  continue;
    1.16 -            
    1.17              pdev = kmalloc(sizeof(phys_dev_t), GFP_KERNEL);
    1.18              pdev->dev = dev;
    1.19              pdev->flags = ACC_WRITE;
    1.20 @@ -647,8 +646,7 @@ void physdev_init_dom0(struct task_struc
    1.21          }
    1.22          else
    1.23          {
    1.24 -            printk("Hiding PCI device %s from DOM0\n",
    1.25 -                   dev->slot_name);
    1.26 +            printk("Hiding PCI device %s from DOM0\n", dev->slot_name);
    1.27          }
    1.28      }
    1.29  }