1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index c31f549ebea0..1c656667b937 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -88,9 +88,7 @@ static int vmlfb_alloc_vram_area(struct vram_area *va, unsigned max_order,
 {
         gfp_t flags;
         unsigned long i;
-        pgprot_t wc_pageprot;
 
-        wc_pageprot = PAGE_KERNEL_NOCACHE;
         max_order++;
         do {
                 /*
@@ -126,14 +124,8 @@ static int vmlfb_alloc_vram_area(struct vram_area *va, unsigned max_order,
         /*
          * Change caching policy of the linear kernel map to avoid
          * mapping type conflicts with user-space mappings.
-         * The first global_flush_tlb() is really only there to do a global
-         * wbinvd().
          */
-
-        global_flush_tlb();
-        change_page_attr(virt_to_page(va->logical), va->size >> PAGE_SHIFT,
-                         wc_pageprot);
-        global_flush_tlb();
+        set_pages_uc(virt_to_page(va->logical), va->size >> PAGE_SHIFT);
 
         printk(KERN_DEBUG MODULE_NAME
                ": Allocated %ld bytes vram area at 0x%08lx\n",
@@ -157,9 +149,8 @@ static void vmlfb_free_vram_area(struct vram_area *va)
                  * Reset the linear kernel map caching policy.
                  */
 
-                change_page_attr(virt_to_page(va->logical),
-                                 va->size >> PAGE_SHIFT, PAGE_KERNEL);
-                global_flush_tlb();
+                set_pages_wb(virt_to_page(va->logical),
+                                 va->size >> PAGE_SHIFT);
 
                 /*
                  * Decrease the usage count on the pages we've used