On 7/26/07, Sam Ravnborg <[EMAIL PROTECTED]> wrote:
On Thu, Jul 26, 2007 at 01:05:09PM -0700, Yinghai Lu wrote: > +#ifdef CONFIG_ACPI_NUMA int pxm; - - /* Allocate per-root-bus (not per bus) arch-specific data. - * TODO: leak; this memory is never freed. - * It's arguable whether it's worth the trouble to care. - */ - sd = kzalloc(sizeof(*sd), GFP_KERNEL); - if (!sd) { - printk(KERN_ERR "PCI: OOM, not probing PCI bus %02x\n", busnum); - return NULL; - } + int node; +#endifif (domain != 0) { printk(KERN_WARNING "PCI: Multiple domains not supported\n"); - kfree(sd); return NULL; } - sd->node = -1; - - pxm = acpi_get_pxm(device->handle); #ifdef CONFIG_ACPI_NUMA - if (pxm >= 0) - sd->node = pxm_to_node(pxm); + pxm = acpi_get_pxm(device->handle); + if (pxm >= 0) { + node = pxm_to_node(pxm); + printk(KERN_INFO "bus %02x -> pxm %d -> node %02x\n", + busnum, pxm, node); + set_mp_bus_to_node(busnum, node); + } #endif The local variable 'node' is only used in the above if statement. So moving the definition inside the if statement will save one pair of ugly #ifdef/#endif
yes, that could be move there. but that pair ugly #ifdef/#endif still need for pxm... YH - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
