FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-24 10:28:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI/IA64: Allocate pci_root_info instead of using stack

Browse Source 
We need to pass around info for release function.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Yijing Wang 2013-06-06 15:34:49 +08:00 committed by Tony Luck
parent 5cd7595dea
commit 429ac0995e
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
arch/ia64/pci/pci.c
View File

@ -331,7 +331,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
int domain = root->segment; int domain = root->segment;
int bus = root->secondary.start; int bus = root->secondary.start;
struct pci_controller *controller; struct pci_controller *controller;
struct pci_root_info info; struct pci_root_info *info = NULL;
int busnum = root->secondary.start;
struct pci_bus *pbus; struct pci_bus *pbus;
char *name; char *name;
int pxm; int pxm;
@ -348,35 +349,43 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
controller->node = pxm_to_node(pxm); controller->node = pxm_to_node(pxm);
#endif #endif
INIT_LIST_HEAD(&info.resources); info = kzalloc(sizeof(*info), GFP_KERNEL);
/* insert busn resource at first */ if (!info) {
pci_add_resource(&info.resources, &root->secondary); printk(KERN_WARNING
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, "pci_bus %04x:%02x: ignored (out of memory)\n",
&info.res_num); root->segment, busnum);
if (info.res_num) { goto out2;
info.res = }
kzalloc_node(sizeof(*info.res) * info.res_num,
GFP_KERNEL, controller->node);
if (!info.res)
goto out2;
info.res_offset = INIT_LIST_HEAD(&info->resources);
kzalloc_node(sizeof(*info.res_offset) * info.res_num, /* insert busn resource at first */
GFP_KERNEL, controller->node); pci_add_resource(&info->resources, &root->secondary);
if (!info.res_offset) acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
&info->res_num);
if (info->res_num) {
info->res =
kzalloc_node(sizeof(*info->res) * info->res_num,
GFP_KERNEL, controller->node);
if (!info->res)
goto out3; goto out3;
info->res_offset =
kzalloc_node(sizeof(*info->res_offset) * info->res_num,
GFP_KERNEL, controller->node);
if (!info->res_offset)
goto out4;
name = kmalloc(16, GFP_KERNEL); name = kmalloc(16, GFP_KERNEL);
if (!name) if (!name)
goto out4; goto out5;
sprintf(name, "PCI Bus %04x:%02x", domain, bus); sprintf(name, "PCI Bus %04x:%02x", domain, bus);
info.bridge = device; info->bridge = device;
info.controller = controller; info->controller = controller;
info.name = name; info->name = name;
info.res_num = 0; info->res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, acpi_walk_resources(device->handle, METHOD_NAME__CRS,
add_window, &info); add_window, info);
} }
/* /*
* See arch/x86/pci/acpi.c. * See arch/x86/pci/acpi.c.
@ -385,18 +394,21 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
* such quirk. So we just ignore the case now. * such quirk. So we just ignore the case now.
*/ */
pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller, pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller,
&info.resources); &info->resources);
if (!pbus) { if (!pbus) {
pci_free_resource_list(&info.resources); pci_free_resource_list(&info->resources);
return NULL; return NULL;
} }
pci_scan_child_bus(pbus); pci_scan_child_bus(pbus);
return pbus; return pbus;
out5:
kfree(info->res_offset);
out4: out4:
kfree(info.res_offset); kfree(info->res);
out3: out3:
kfree(info.res); kfree(info);
out2: out2:
kfree(controller); kfree(controller);
out1: out1: