From cefa3af1ae482653002ca7589f72a990fd73f898 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 26 Jun 2006 13:56:49 +0200
Subject: [PATCH] --- yaml --- r: 30463 b: refs/heads/master c:
 f201611fcecdfa825471dc425ee007997228fae4 h: refs/heads/master i:   30461:
 a802b45c1a86b39e67edab62a563dc62882623bb   30459:
 bcd71cd09a8126a77651df2ecf3b35a7e8d470c6   30455:
 360c6a541280aa18bb15ad845d9a38e6be92fb45   30447:
 585a59531e48f555bc228a6d3a8cb691d532d857   30431:
 a4dc08081c3c7e0642876d8d651b228abece1499   30399:
 17791267c872b4c09a6da1f889a4ba77a54ded88   30335:
 cf471bb67012a65d76e84dd12c64a1450eb2ffe4   30207:
 589ad079c10345de9d684b9e90fc5c2d801c6fff v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/pci-gart.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 84495794a1be..18de9b68a7a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ebcc00e95fa78218a048a88d8d5ee491aa7d6d0
+refs/heads/master: f201611fcecdfa825471dc425ee007997228fae4
diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c
index ded3af3bceec..82a346e6e2e4 100644
--- a/trunk/arch/x86_64/kernel/pci-gart.c
+++ b/trunk/arch/x86_64/kernel/pci-gart.c
@@ -581,7 +581,7 @@ static int __init pci_iommu_init(void)
 
 	if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {
 		printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");
-		return -1;
+		return -ENODEV;
 	}
 
 #ifndef CONFIG_AGP_AMD64
@@ -595,7 +595,7 @@ static int __init pci_iommu_init(void)
 #endif	
 
 	if (swiotlb)
-		return -1; 
+		return -ENODEV;
 
 	if (no_iommu ||
 	    (!force_iommu && end_pfn <= MAX_DMA32_PFN) ||
@@ -607,7 +607,7 @@ static int __init pci_iommu_init(void)
 					"but IOMMU not available.\n"
 			       KERN_ERR "WARNING 32bit PCI may malfunction.\n");
 		}
-		return -1;
+		return -ENODEV;
 	}
 
 	printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n");