From 8a59932197bbbdb955bf8acf8ef33d7ab69a4c0a Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Fri, 3 Sep 2010 18:39:41 +0200 Subject: [PATCH] --- yaml --- r: 211691 b: refs/heads/master c: 1b13fe6a6e9986dbc079cbb05090be75edbffa5d h: refs/heads/master i: 211689: ed884a6a414205128908c87599b53bdc8d5460d7 211687: 0a8b479a7e0e1f5055767eb7447de2d63b2c739c v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/generic.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b3115598269e..23a83e6c05ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 260133ab658bd2b80e07832a878e00405e19ff43 +refs/heads/master: 1b13fe6a6e9986dbc079cbb05090be75edbffa5d diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c index d2abf5143983..64255cef8a7d 100644 --- a/trunk/drivers/char/agp/generic.c +++ b/trunk/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),