diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2007-07-17 04:05:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 10:23:11 -0700 |
commit | 10eb2659cc6059d0c4de2e2c66d1534091519f56 (patch) | |
tree | 804a53c7a3fd6fb4ef72454a0d962c3883bbb828 /include | |
parent | 0c6c1ce079082ddde9ba5636c352c235cd395aa1 (diff) | |
download | op-kernel-dev-10eb2659cc6059d0c4de2e2c66d1534091519f56.zip op-kernel-dev-10eb2659cc6059d0c4de2e2c66d1534091519f56.tar.gz |
fbdev: move arch-specific bits to their respective subdirectories
Move arch-specific bits of fb_mmap() to their respective subdirectories
[bob.picco@hp.com: efi_range_is_wc is referenced but not declared]
[bunk@stusta.de: fix include/asm-m68k/fb.h]
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-alpha/fb.h | 7 | ||||
-rw-r--r-- | include/asm-arm/fb.h | 13 | ||||
-rw-r--r-- | include/asm-arm26/fb.h | 6 | ||||
-rw-r--r-- | include/asm-avr32/fb.h | 15 | ||||
-rw-r--r-- | include/asm-blackfin/fb.h | 6 | ||||
-rw-r--r-- | include/asm-cris/fb.h | 6 | ||||
-rw-r--r-- | include/asm-frv/fb.h | 6 | ||||
-rw-r--r-- | include/asm-h8300/fb.h | 6 | ||||
-rw-r--r-- | include/asm-i386/fb.h | 14 | ||||
-rw-r--r-- | include/asm-ia64/fb.h | 17 | ||||
-rw-r--r-- | include/asm-m32r/fb.h | 13 | ||||
-rw-r--r-- | include/asm-m68k/fb.h | 28 | ||||
-rw-r--r-- | include/asm-m68knommu/fb.h | 6 | ||||
-rw-r--r-- | include/asm-mips/fb.h | 13 | ||||
-rw-r--r-- | include/asm-parisc/fb.h | 13 | ||||
-rw-r--r-- | include/asm-powerpc/fb.h | 15 | ||||
-rw-r--r-- | include/asm-s390/fb.h | 6 | ||||
-rw-r--r-- | include/asm-sh/fb.h | 13 | ||||
-rw-r--r-- | include/asm-sh64/fb.h | 13 | ||||
-rw-r--r-- | include/asm-sparc/fb.h | 6 | ||||
-rw-r--r-- | include/asm-sparc64/fb.h | 12 | ||||
-rw-r--r-- | include/asm-v850/fb.h | 6 | ||||
-rw-r--r-- | include/asm-x86_64/fb.h | 14 | ||||
-rw-r--r-- | include/asm-xtensa/fb.h | 6 |
24 files changed, 260 insertions, 0 deletions
diff --git a/include/asm-alpha/fb.h b/include/asm-alpha/fb.h new file mode 100644 index 0000000..ca714a4 --- /dev/null +++ b/include/asm-alpha/fb.h @@ -0,0 +1,7 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +/* Caching is off in the I/O space quadrant by design. */ +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-arm/fb.h b/include/asm-arm/fb.h new file mode 100644 index 0000000..4bf5b88 --- /dev/null +++ b/include/asm-arm/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-arm26/fb.h b/include/asm-arm26/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-arm26/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-avr32/fb.h b/include/asm-avr32/fb.h new file mode 100644 index 0000000..d22a4a8 --- /dev/null +++ b/include/asm-avr32/fb.h @@ -0,0 +1,15 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = __pgprot((pgprot_val(vma->vm_page_prot) + & ~_PAGE_CACHABLE) + | (_PAGE_BUFFER | _PAGE_DIRTY)); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-blackfin/fb.h b/include/asm-blackfin/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-blackfin/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-cris/fb.h b/include/asm-cris/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-cris/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-frv/fb.h b/include/asm-frv/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-frv/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-h8300/fb.h b/include/asm-h8300/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-h8300/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-i386/fb.h b/include/asm-i386/fb.h new file mode 100644 index 0000000..d30073c --- /dev/null +++ b/include/asm-i386/fb.h @@ -0,0 +1,14 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + if (boot_cpu_data.x86 > 3) + pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-ia64/fb.h b/include/asm-ia64/fb.h new file mode 100644 index 0000000..9d4577f --- /dev/null +++ b/include/asm-ia64/fb.h @@ -0,0 +1,17 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <linux/efi.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start)) + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); + else + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-m32r/fb.h b/include/asm-m32r/fb.h new file mode 100644 index 0000000..4bf5b88 --- /dev/null +++ b/include/asm-m32r/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-m68k/fb.h b/include/asm-m68k/fb.h new file mode 100644 index 0000000..f78bad4 --- /dev/null +++ b/include/asm-m68k/fb.h @@ -0,0 +1,28 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> +#include <asm/setup.h> + +#ifdef CONFIG_SUN3 +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE; +} +#else +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + if (CPU_IS_020_OR_030) + pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030; + if (CPU_IS_040_OR_060) { + pgprot_val(vma->vm_page_prot) &= _CACHEMASK040; + /* Use no-cache mode, serialized */ + pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S; + } +} +#endif /* CONFIG_SUN3 */ + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-m68knommu/fb.h b/include/asm-m68knommu/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-m68knommu/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-mips/fb.h b/include/asm-mips/fb.h new file mode 100644 index 0000000..ac23d96 --- /dev/null +++ b/include/asm-mips/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-parisc/fb.h b/include/asm-parisc/fb.h new file mode 100644 index 0000000..d5e47ed --- /dev/null +++ b/include/asm-parisc/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-powerpc/fb.h b/include/asm-powerpc/fb.h new file mode 100644 index 0000000..e13d6eb --- /dev/null +++ b/include/asm-powerpc/fb.h @@ -0,0 +1,15 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, + vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-s390/fb.h b/include/asm-s390/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-s390/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-sh/fb.h b/include/asm-sh/fb.h new file mode 100644 index 0000000..4bf5b88 --- /dev/null +++ b/include/asm-sh/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-sh64/fb.h b/include/asm-sh64/fb.h new file mode 100644 index 0000000..4bf5b88 --- /dev/null +++ b/include/asm-sh64/fb.h @@ -0,0 +1,13 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-sparc/fb.h b/include/asm-sparc/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-sparc/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h new file mode 100644 index 0000000..8703c70 --- /dev/null +++ b/include/asm-sparc64/fb.h @@ -0,0 +1,12 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-v850/fb.h b/include/asm-v850/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-v850/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-x86_64/fb.h b/include/asm-x86_64/fb.h new file mode 100644 index 0000000..d30073c --- /dev/null +++ b/include/asm-x86_64/fb.h @@ -0,0 +1,14 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#include <linux/fs.h> +#include <asm/page.h> + +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, + unsigned long off) +{ + if (boot_cpu_data.x86 > 3) + pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; +} + +#endif /* _ASM_FB_H_ */ diff --git a/include/asm-xtensa/fb.h b/include/asm-xtensa/fb.h new file mode 100644 index 0000000..9f8c88d --- /dev/null +++ b/include/asm-xtensa/fb.h @@ -0,0 +1,6 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ + +#define fb_pgprotect(...) do {} while (0) + +#endif /* _ASM_FB_H_ */ |