From ba75859c7e4a96454c07ff7a064f086eac591220 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 20 Feb 2008 10:37:08 +1000 Subject: [PATCH] --- yaml --- r: 86015 b: refs/heads/master c: 44a207fc66c13c82f627178f9f858b8f3e76028f h: refs/heads/master i: 86013: 51ab0e164ba905df0d3fe7b116b548b9f5ce18b0 86011: 8ad2b7341ef6cff61f6ad78a55dac99a86de68e7 86007: 8d074f22073db975f47cc24d1765cb8145583018 85999: 6085d84e98a80864533e8eb1373914bdf245d0e1 85983: 65b5b45a1845549d9b2697eb88ddaafcc0220f1b 85951: 172cc746974f1565622ff13c791985edb23b8a00 85887: 7b88ceeae015a9f1160ef2f52b89053a3c405dd0 85759: 71053cf2bb2735817a3aa7949de19913220c39f9 85503: a370114482318109345f25553babf64e5b7d5a31 84991: 1db98c2ca37f504274918acd6ea83b74730115b1 83967: 710586e63e10d8bc9095c5ed2e951373c1315d4d 81919: 86990bbb9e4622883ae58e694d03b932f7543f22 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/amd-k7-agp.c | 4 ++-- trunk/drivers/char/agp/ati-agp.c | 4 ++-- trunk/drivers/char/agp/sworks-agp.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4fc40dac31c5..7a180011632f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e374748c73f34e018a1c13a86a96a15fc55a65a +refs/heads/master: 44a207fc66c13c82f627178f9f858b8f3e76028f diff --git a/trunk/drivers/char/agp/amd-k7-agp.c b/trunk/drivers/char/agp/amd-k7-agp.c index fca4d7f30443..d28669992147 100644 --- a/trunk/drivers/char/agp/amd-k7-agp.c +++ b/trunk/drivers/char/agp/amd-k7-agp.c @@ -54,7 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map) } global_cache_flush(); #else - set_memory_uc(page_map->real, 1); + set_memory_uc((unsigned long)page_map->real, 1); page_map->remapped = page_map->real; #endif @@ -72,7 +72,7 @@ static void amd_free_page_map(struct amd_page_map *page_map) iounmap(page_map->remapped); ClearPageReserved(virt_to_page(page_map->real)); #else - set_memory_wb(page_map->real, 1); + set_memory_wb((unsigned long)page_map->real, 1); #endif free_page((unsigned long) page_map->real); } diff --git a/trunk/drivers/char/agp/ati-agp.c b/trunk/drivers/char/agp/ati-agp.c index 9ac3bef3bb7a..55c97f623242 100644 --- a/trunk/drivers/char/agp/ati-agp.c +++ b/trunk/drivers/char/agp/ati-agp.c @@ -60,7 +60,7 @@ static int ati_create_page_map(struct ati_page_map *page_map) if (page_map->real == NULL) return -ENOMEM; - set_memory_uc(page_map->real, 1); + set_memory_uc((unsigned long)page_map->real, 1); err = map_page_into_agp(virt_to_page(page_map->real)); page_map->remapped = page_map->real; @@ -76,7 +76,7 @@ static int ati_create_page_map(struct ati_page_map *page_map) static void ati_free_page_map(struct ati_page_map *page_map) { unmap_page_from_agp(virt_to_page(page_map->real)); - set_memory_wb(page_map->real, 1); + set_memory_wb((unsigned long)page_map->real, 1); free_page((unsigned long) page_map->real); } diff --git a/trunk/drivers/char/agp/sworks-agp.c b/trunk/drivers/char/agp/sworks-agp.c index ae06f8982068..e08934e58f32 100644 --- a/trunk/drivers/char/agp/sworks-agp.c +++ b/trunk/drivers/char/agp/sworks-agp.c @@ -53,7 +53,7 @@ static int serverworks_create_page_map(struct serverworks_page_map *page_map) return -ENOMEM; } - set_memory_uc(page_map->real, 1); + set_memory_uc((unsigned long)page_map->real, 1); page_map->remapped = page_map->real; for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) @@ -65,7 +65,7 @@ static int serverworks_create_page_map(struct serverworks_page_map *page_map) static void serverworks_free_page_map(struct serverworks_page_map *page_map) { - set_memory_wb(page_map->real, 1); + set_memory_wb((unsigned long)page_map->real, 1); free_page((unsigned long) page_map->real); }