diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-07-26 20:03:34 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-07-26 20:03:34 +0000 |
| commit | e79f9f9bf033cdf66422089c6bb3ffb309ec8650 (patch) | |
| tree | d8899281dc9fd3beb0b0b73ddc5c9323e63f2b32 /xen/drivers/pci | |
| parent | a61052ced78d6b7a6dec9447bbd91c376ff93dd5 (diff) | |
| download | xen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.tar.gz xen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.tar.bz2 xen-e79f9f9bf033cdf66422089c6bb3ffb309ec8650.zip | |
bitkeeper revision 1.1108.1.29 (41056396oI8TDCaTvBdU_3II1cHF9Q)
Rename memory allocator interfaces in Xen to avoid conflicts with
Linux namespace.
Diffstat (limited to 'xen/drivers/pci')
| -rw-r--r-- | xen/drivers/pci/pci.c | 10 | ||||
| -rw-r--r-- | xen/drivers/pci/setup-bus.c | 2 | ||||
| -rw-r--r-- | xen/drivers/pci/setup-res.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index f8697d1337..4ae22d07e0 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -1126,7 +1126,7 @@ static struct pci_bus * __devinit pci_alloc_bus(void) { struct pci_bus *b; - b = kmalloc(sizeof(*b)); + b = xmalloc(sizeof(*b)); if (b) { memset(b, 0, sizeof(*b)); INIT_LIST_HEAD(&b->children); @@ -1351,7 +1351,7 @@ struct pci_dev * __devinit pci_scan_device(struct pci_dev *temp) if (l == 0xffffffff || l == 0x00000000 || l == 0x0000ffff || l == 0xffff0000) return NULL; - dev = kmalloc(sizeof(*dev)); + dev = xmalloc(sizeof(*dev)); if (!dev) return NULL; @@ -1363,7 +1363,7 @@ struct pci_dev * __devinit pci_scan_device(struct pci_dev *temp) set this higher, assuming the system even supports it. */ dev->dma_mask = 0xffffffff; if (pci_setup_device(dev) < 0) { - kfree(dev); + xfree(dev); dev = NULL; } return dev; @@ -1431,7 +1431,7 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus) max = bus->secondary; /* Create a device template */ - dev0 = kmalloc(sizeof(struct pci_dev)); + dev0 = xmalloc(sizeof(struct pci_dev)); if(!dev0) { panic("Out of memory scanning PCI bus!\n"); } @@ -1444,7 +1444,7 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus) dev0->devfn = devfn; pci_scan_slot(dev0); } - kfree(dev0); + xfree(dev0); /* * After performing arch-dependent fixup of the bus, look behind diff --git a/xen/drivers/pci/setup-bus.c b/xen/drivers/pci/setup-bus.c index 4719c08181..0819c99b59 100644 --- a/xen/drivers/pci/setup-bus.c +++ b/xen/drivers/pci/setup-bus.c @@ -74,7 +74,7 @@ pbus_assign_resources_sorted(struct pci_bus *bus) pci_assign_resource(list->dev, idx); tmp = list; list = list->next; - kfree(tmp); + xfree(tmp); } return found_vga; diff --git a/xen/drivers/pci/setup-res.c b/xen/drivers/pci/setup-res.c index 3486f7a1ed..3435b2ac9c 100644 --- a/xen/drivers/pci/setup-res.c +++ b/xen/drivers/pci/setup-res.c @@ -171,10 +171,10 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) ln->res->start; } if (r_align > align) { - tmp = kmalloc(sizeof(*tmp)); + tmp = xmalloc(sizeof(*tmp)); if (!tmp) panic("pdev_sort_resources(): " - "kmalloc() failed!\n"); + "xmalloc() failed!\n"); tmp->next = ln; tmp->res = r; tmp->dev = dev; |