From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 11 Feb 2008 00:35:20 +0000 (+0100)
Subject: Prevent IDE boot ops on NUMA system
X-Git-Tag: v2.6.25-rc2~91
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1f07e988290fc45932f5028c9e2a862c37a57336;p=linux-2.6-omap-h63xx.git

Prevent IDE boot ops on NUMA system

Without this patch a Opteron test system here oopses at boot with
current git.

Calling to_pci_dev() on a NULL pointer gives a negative value so the
following NULL pointer check never triggers and then an illegal address
is referenced.  Check the unadjusted original device pointer for NULL
instead.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 23fad89292d..a3b69c10d66 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1295,7 +1295,7 @@ static inline void ide_dump_identify(u8 *id)
 static inline int hwif_to_node(ide_hwif_t *hwif)
 {
 	struct pci_dev *dev = to_pci_dev(hwif->dev);
-	return dev ? pcibus_to_node(dev->bus) : -1;
+	return hwif->dev ? pcibus_to_node(dev->bus) : -1;
 }
 
 static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)