From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261471AbVGGRXw (ORCPT ); Thu, 7 Jul 2005 13:23:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261473AbVGGRXp (ORCPT ); Thu, 7 Jul 2005 13:23:45 -0400 Received: from graphe.net ([209.204.138.32]:34515 "EHLO graphe.net") by vger.kernel.org with ESMTP id S261471AbVGGRXd (ORCPT ); Thu, 7 Jul 2005 13:23:33 -0400 Date: Thu, 7 Jul 2005 10:23:28 -0700 (PDT) From: Christoph Lameter X-X-Sender: christoph@graphe.net To: Linus Torvalds cc: Andi Kleen , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [another PATCH] Fix crash on boot in kmalloc_node IDE changes In-Reply-To: Message-ID: References: <20050706133052.GF21330@wotan.suse.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Spam-Score: -5.8 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 7 Jul 2005, Linus Torvalds wrote: > If you make it use a trivial inline function for the thing, I think that > would be ok, though. Like this? Index: linux-2.6.git/drivers/ide/ide-probe.c =================================================================== --- linux-2.6.git.orig/drivers/ide/ide-probe.c 2005-06-23 11:38:02.000000000 -0700 +++ linux-2.6.git/drivers/ide/ide-probe.c 2005-07-07 10:22:02.000000000 -0700 @@ -960,6 +960,15 @@ } #endif /* MAX_HWIFS > 1 */ +static inline int hwif_to_node(ide_hwif_t *hwif) +{ + if (hwif && hwif->pci_dev) + return pcibus_to_node(hwif->pci_dev->bus); + else + /* Add ways to determine the node of other busses here */ + return -1; +} + /* * init request queue */ @@ -978,8 +987,7 @@ * do not. */ - q = blk_init_queue_node(do_ide_request, &ide_lock, - pcibus_to_node(drive->hwif->pci_dev->bus)); + q = blk_init_queue_node(do_ide_request, &ide_lock, hwif_to_node(hwif)); if (!q) return 1; @@ -1097,7 +1105,7 @@ spin_unlock_irq(&ide_lock); } else { hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL, - pcibus_to_node(hwif->drives[0].hwif->pci_dev->bus)); + hwif_to_node(hwif->drives[0].hwif)); if (!hwgroup) goto out_up;