[tip:core/iommu] AGP: Warn when GATT memory cannot be set to UC

[tip-bot for Borislav Petkov]

Commit-ID:  1b13fe6a6e9986dbc079cbb05090be75edbffa5d
Gitweb:     http://git.kernel.org/tip/1b13fe6a6e9986dbc079cbb05090be75edbffa5d
Author:     Borislav Petkov <borislav.petkov@xxxxxxx>
AuthorDate: Fri, 3 Sep 2010 18:39:41 +0200
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 5 Sep 2010 14:28:34 +0200

AGP: Warn when GATT memory cannot be set to UC

This is one of those paranoid checks which should at least tell
us that something is about to go haywire after we've disabled
GART table walk probes which is done by default now on AMD.

Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxxxx>
Cc: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
LKML-Reference: <1283531981-7495-4-git-send-email-bp@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 drivers/char/agp/generic.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index d2abf51..64255ce 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -984,7 +984,9 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 
 	bridge->driver->cache_flush();
 #ifdef CONFIG_X86
-	set_memory_uc((unsigned long)table, 1 << page_order);
+	if (set_memory_uc((unsigned long)table, 1 << page_order))
+		printk(KERN_WARNING "Could not set GATT table memory to UC!");
+
 	bridge->gatt_table = (void *)table;
 #else
 	bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/