[Xen-devel] [PATCH 04/17] x86: Use new cache mode type in drivers/video/fbdev/vermilion

[Juergen Gross <jgross@xxxxxxxx>]

Instead of directly using the cache mode bits in the pte switch to
using the cache mode type.

Signed-off-by: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 drivers/video/fbdev/vermilion/vermilion.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/vermilion/vermilion.c 
b/drivers/video/fbdev/vermilion/vermilion.c
index 5f930ae..6b70d7f 100644
--- a/drivers/video/fbdev/vermilion/vermilion.c
+++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -1003,13 +1003,15 @@ static int vmlfb_mmap(struct fb_info *info, struct 
vm_area_struct *vma)
        struct vml_info *vinfo = container_of(info, struct vml_info, info);
        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
        int ret;
+       unsigned long prot;
 
        ret = vmlfb_vram_offset(vinfo, offset);
        if (ret)
                return -EINVAL;
 
-       pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
-       pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
+       prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK;
+       pgprot_val(vma->vm_page_prot) =
+               prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS);
 
        return vm_iomap_memory(vma, vinfo->vram_start,
                        vinfo->vram_contig_size);
-- 
1.8.4.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel