3 files changed, 19 insertions, 4 deletions

diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index aaac3b2fb746..1a5da2e63aee 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -98,11 +98,22 @@ static inline u16 amd_get_node_id(struct pci_dev *pdev)
         return 0;
 }
 
+static inline bool amd_gart_present(void)
+{
+        /* GART present only on Fam15h, upto model 0fh */
+        if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
+            (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model < 0x10))
+                return true;
+
+        return false;
+}
+
 #else
 
 #define amd_nb_num(x)           0
 #define amd_nb_has_feature(x)   false
 #define node_to_amd_nb(x)       NULL
+#define amd_gart_present(x)     false
 
 #endif
 
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 5caed1dd7ccf..29fa475ec518 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -89,9 +89,7 @@ int amd_cache_northbridges(void)
                         next_northbridge(link, amd_nb_link_ids);
         }
 
-        /* GART present only on Fam15h upto model 0fh */
-        if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
-            (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model < 0x10))
+        if (amd_gart_present())
                 amd_northbridges.flags |= AMD_NB_GART;
 
         /*
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 76164e173a24..6e85f713641d 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -262,6 +262,9 @@ void __init early_gart_iommu_check(void)
         u64 aper_base = 0, last_aper_base = 0;
         int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0;
 
+        if (!amd_gart_present())
+                return;
+
         if (!early_pci_allowed())
                 return;
 
@@ -355,6 +358,9 @@ int __init gart_iommu_hole_init(void)
         int fix, slot, valid_agp = 0;
         int i, node;
 
+        if (!amd_gart_present())
+                return -ENODEV;
+
         if (gart_iommu_aperture_disabled || !fix_aperture ||
             !early_pci_allowed())
                 return -ENODEV;
@@ -452,7 +458,7 @@ out:
                    force_iommu ||
                    valid_agp ||
                    fallback_aper_force) {
-                pr_info("Your BIOS doesn't leave a aperture memory hole\n");
+                pr_info("Your BIOS doesn't leave an aperture memory hole\n");
                 pr_info("Please enable the IOMMU option in the BIOS setup\n");
                 pr_info("This costs you %dMB of RAM\n",
                         32 << fallback_aper_order);