diff options
| -rw-r--r-- | drivers/char/agp/amd-k7-agp.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index b1b4362bc64..45681c0ff3b 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
| @@ -41,22 +41,8 @@ static int amd_create_page_map(struct amd_page_map *page_map) | |||
| 41 | if (page_map->real == NULL) | 41 | if (page_map->real == NULL) |
| 42 | return -ENOMEM; | 42 | return -ENOMEM; |
| 43 | 43 | ||
| 44 | #ifndef CONFIG_X86 | ||
| 45 | SetPageReserved(virt_to_page(page_map->real)); | ||
| 46 | global_cache_flush(); | ||
| 47 | page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real), | ||
| 48 | PAGE_SIZE); | ||
| 49 | if (page_map->remapped == NULL) { | ||
| 50 | ClearPageReserved(virt_to_page(page_map->real)); | ||
| 51 | free_page((unsigned long) page_map->real); | ||
| 52 | page_map->real = NULL; | ||
| 53 | return -ENOMEM; | ||
| 54 | } | ||
| 55 | global_cache_flush(); | ||
| 56 | #else | ||
| 57 | set_memory_uc((unsigned long)page_map->real, 1); | 44 | set_memory_uc((unsigned long)page_map->real, 1); |
| 58 | page_map->remapped = page_map->real; | 45 | page_map->remapped = page_map->real; |
| 59 | #endif | ||
| 60 | 46 | ||
| 61 | for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) { | 47 | for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) { |
| 62 | writel(agp_bridge->scratch_page, page_map->remapped+i); | 48 | writel(agp_bridge->scratch_page, page_map->remapped+i); |
| @@ -68,12 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map) | |||
| 68 | 54 | ||
| 69 | static void amd_free_page_map(struct amd_page_map *page_map) | 55 | static void amd_free_page_map(struct amd_page_map *page_map) |
| 70 | { | 56 | { |
| 71 | #ifndef CONFIG_X86 | ||
| 72 | iounmap(page_map->remapped); | ||
| 73 | ClearPageReserved(virt_to_page(page_map->real)); | ||
| 74 | #else | ||
| 75 | set_memory_wb((unsigned long)page_map->real, 1); | 57 | set_memory_wb((unsigned long)page_map->real, 1); |
| 76 | #endif | ||
| 77 | free_page((unsigned long) page_map->real); | 58 | free_page((unsigned long) page_map->real); |
| 78 | } | 59 | } |
| 79 | 60 | ||
