mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christoph Lameter <christoph@lameter.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Andi Kleen <ak@suse.de>,
	linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [another PATCH] Fix crash on boot in kmalloc_node IDE changes
Date: Thu, 7 Jul 2005 10:23:28 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.62.0507071022480.7105@graphe.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0507070937130.3293@g5.osdl.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;
 

  parent reply	other threads:[~2005-07-07 17:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-06 13:30 [PATCH] " Andi Kleen
2005-07-06 14:05 ` Bartlomiej Zolnierkiewicz
2005-07-06 14:09   ` Andi Kleen
2005-07-06 14:35     ` Bartlomiej Zolnierkiewicz
2005-07-06 18:21       ` Andi Kleen
2005-07-06 16:34 ` Christoph Lameter
2005-07-06 16:45   ` Andi Kleen
2005-07-06 17:07     ` Christoph Lameter
2005-07-07 16:21 ` [another PATCH] " Christoph Lameter
2005-07-07 16:24   ` Andi Kleen
2005-07-07 16:32     ` Christoph Lameter
2005-07-07 16:36       ` Andi Kleen
2005-07-07 17:15         ` Christoph Lameter
2005-07-07 16:46       ` Bartlomiej Zolnierkiewicz
2005-07-07 16:38   ` Linus Torvalds
2005-07-07 16:40     ` Andi Kleen
2005-07-07 17:23     ` Christoph Lameter [this message]
2005-07-07 17:31       ` Jens Axboe
2005-07-07 18:57       ` Linus Torvalds
2005-07-07 19:09         ` Christoph Lameter
2005-07-07 21:15           ` Andi Kleen
2005-07-07 21:19             ` Bartlomiej Zolnierkiewicz
2005-07-07 21:25               ` Andi Kleen
2005-07-08  4:44                 ` Christoph Lameter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.62.0507071022480.7105@graphe.net \
    --to=christoph@lameter.com \
    --cc=ak@suse.de \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®