---

yaml --- r: 86015 b: refs/heads/master c: 44a207f h: refs/heads/master i: 86013: 51ab0e1 86011: 8ad2b73 86007: 8d074f2 85999: 6085d84 85983: 65b5b45 85951: 172cc74 85887: 7b88cee 85759: 71053cf 85503: a370114 84991: 1db98c2 83967: 710586e 81919: 86990bb v: v3
git-mirror · Feb 20, 2008 · ba75859 · ba75859
1 parent d392c37
commit ba75859
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 }