diff options
| -rw-r--r-- | arch/x86/include/asm/fb.h | 14 | ||||
| -rw-r--r-- | arch/x86/video/fbdev.c | 17 |
2 files changed, 18 insertions, 13 deletions
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h index a3fb801f12f1..23873da8fb77 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/fb.h @@ -2,21 +2,11 @@ #ifndef _ASM_X86_FB_H #define _ASM_X86_FB_H -#include <asm/page.h> - struct fb_info; struct file; +struct vm_area_struct; -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, - unsigned long off) -{ - unsigned long prot; - - prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK; - if (boot_cpu_data.x86 > 3) - pgprot_val(vma->vm_page_prot) = - prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); -} +void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off); #define fb_pgprotect fb_pgprotect int fb_is_primary_device(struct fb_info *info); diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c index 5ec4eafbb981..57ee3c158f97 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/fbdev.c @@ -6,11 +6,25 @@ * for more details. * */ + +#include <asm/fb.h> + #include <linux/fb.h> -#include <linux/pci.h> #include <linux/module.h> +#include <linux/pci.h> #include <linux/vgaarb.h> +void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) +{ + unsigned long prot; + + prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK; + if (boot_cpu_data.x86 > 3) + pgprot_val(vma->vm_page_prot) = + prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); +} +EXPORT_SYMBOL(fb_pgprotect); + int fb_is_primary_device(struct fb_info *info) { struct device *device = info->device; @@ -26,4 +40,5 @@ int fb_is_primary_device(struct fb_info *info) return 0; } EXPORT_SYMBOL(fb_is_primary_device); + MODULE_LICENSE("GPL"); |