lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Use alloc_maybe_bootmem() in pcibios_alloc_controller

Browse Source 
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>
This commit is contained in:
Linas Vepstas
2007-10-03 07:40:12 +10:00
committed by Paul Mackerras
parent da0bd34e03
commit 2d5f565964
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/kernel/pci-common.c
View File

@@ -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 = alloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);
phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
else
phb = alloc_bootmem(sizeof (struct pci_controller));
if (phb == NULL) if (phb == NULL)
return NULL; return NULL;
pci_setup_pci_controller(phb); pci_setup_pci_controller(phb);