Browse Source

[POWERPC] Use alloc_maybe_bootmem() in pcibios_alloc_controller

Use alloc_maybe_bootmem() which wraps the if (mem_init_done)
malloc clause.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Linas Vepstas 17 years ago
parent
commit
2d5f565964
1 changed files with 2 additions and 5 deletions
  1. 2 5
      arch/powerpc/kernel/pci-common.c

+ 2 - 5
arch/powerpc/kernel/pci-common.c

@@ -65,14 +65,11 @@ static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
 	spin_unlock(&hose_spinlock);
 	spin_unlock(&hose_spinlock);
 }
 }
 
 
-__init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 {
 {
 	struct pci_controller *phb;
 	struct pci_controller *phb;
 
 
-	if (mem_init_done)
-		phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
-	else
-		phb = alloc_bootmem(sizeof (struct pci_controller));
+	phb = alloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);
 	if (phb == NULL)
 	if (phb == NULL)
 		return NULL;
 		return NULL;
 	pci_setup_pci_controller(phb);
 	pci_setup_pci_controller(phb);