bitkeeper revision 1.1007 (40d9a9b67QWaIdCVPMQU8ujlBGA1nQ)

Remove GFP_* flags from memory allocators.
Something similar may get added back to the buddy allocator if it
gets used for allocating domain memory on some architectures.

2 files changed, 5 insertions, 5 deletions

diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c
index c7dde554a1..258d9d8c8a 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), GFP_KERNEL);
+	b = kmalloc(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), GFP_KERNEL);
+	dev = kmalloc(sizeof(*dev));
 	if (!dev)
 		return NULL;
 
@@ -1424,14 +1424,14 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
 {
 	unsigned int devfn, max, pass;
 	struct list_head *ln;
-	/* XEN MODIFICATION: Allocate 'dev0' on heap to avoid stack overflow. */
+	/* XEN MODIFICATION: Allocate dev0 on heap to avoid stack overflow. */
 	struct pci_dev *dev, *dev0;
 
 	DBG("Scanning bus %02x\n", bus->number);
 	max = bus->secondary;
 
 	/* Create a device template */
-	dev0 = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+	dev0 = kmalloc(sizeof(struct pci_dev));
 	if(!dev0) {
 	  panic("Out of memory scanning PCI bus!\n");
 	}
diff --git a/xen/drivers/pci/setup-res.c b/xen/drivers/pci/setup-res.c
index fdd85c9f13..3486f7a1ed 100644
--- a/xen/drivers/pci/setup-res.c
+++ b/xen/drivers/pci/setup-res.c
@@ -171,7 +171,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 					ln->res->start;
 			}
 			if (r_align > align) {
-				tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
+				tmp = kmalloc(sizeof(*tmp));
 				if (!tmp)
 					panic("pdev_sort_resources(): "
 					      "kmalloc() failed!\n");