diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2007-07-17 07:05:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:11 -0400 |
commit | 10eb2659cc6059d0c4de2e2c66d1534091519f56 (patch) | |
tree | 804a53c7a3fd6fb4ef72454a0d962c3883bbb828 /include | |
parent | 0c6c1ce079082ddde9ba5636c352c235cd395aa1 (diff) |
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 000000000000..ca714a4e3557 --- /dev/null +++ b/include/asm-alpha/fb.h | |||
@@ -0,0 +1,7 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | /* Caching is off in the I/O space quadrant by design. */ | ||
5 | #define fb_pgprotect(...) do {} while (0) | ||
6 | |||
7 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-arm/fb.h b/include/asm-arm/fb.h new file mode 100644 index 000000000000..4bf5b88d90bf --- /dev/null +++ b/include/asm-arm/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-arm26/fb.h b/include/asm-arm26/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-arm26/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-avr32/fb.h b/include/asm-avr32/fb.h new file mode 100644 index 000000000000..d22a4a876694 --- /dev/null +++ b/include/asm-avr32/fb.h | |||
@@ -0,0 +1,15 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = __pgprot((pgprot_val(vma->vm_page_prot) | ||
11 | & ~_PAGE_CACHABLE) | ||
12 | | (_PAGE_BUFFER | _PAGE_DIRTY)); | ||
13 | } | ||
14 | |||
15 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-blackfin/fb.h b/include/asm-blackfin/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-blackfin/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-cris/fb.h b/include/asm-cris/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-cris/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-frv/fb.h b/include/asm-frv/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-frv/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-h8300/fb.h b/include/asm-h8300/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-h8300/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-i386/fb.h b/include/asm-i386/fb.h new file mode 100644 index 000000000000..d30073c75586 --- /dev/null +++ b/include/asm-i386/fb.h | |||
@@ -0,0 +1,14 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | if (boot_cpu_data.x86 > 3) | ||
11 | pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; | ||
12 | } | ||
13 | |||
14 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-ia64/fb.h b/include/asm-ia64/fb.h new file mode 100644 index 000000000000..9d4577f9fe0e --- /dev/null +++ b/include/asm-ia64/fb.h | |||
@@ -0,0 +1,17 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <linux/efi.h> | ||
6 | #include <asm/page.h> | ||
7 | |||
8 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
9 | unsigned long off) | ||
10 | { | ||
11 | if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start)) | ||
12 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); | ||
13 | else | ||
14 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
15 | } | ||
16 | |||
17 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-m32r/fb.h b/include/asm-m32r/fb.h new file mode 100644 index 000000000000..4bf5b88d90bf --- /dev/null +++ b/include/asm-m32r/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-m68k/fb.h b/include/asm-m68k/fb.h new file mode 100644 index 000000000000..f78bad476b08 --- /dev/null +++ b/include/asm-m68k/fb.h | |||
@@ -0,0 +1,28 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | #include <asm/setup.h> | ||
7 | |||
8 | #ifdef CONFIG_SUN3 | ||
9 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
10 | unsigned long off) | ||
11 | { | ||
12 | pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE; | ||
13 | } | ||
14 | #else | ||
15 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
16 | unsigned long off) | ||
17 | { | ||
18 | if (CPU_IS_020_OR_030) | ||
19 | pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030; | ||
20 | if (CPU_IS_040_OR_060) { | ||
21 | pgprot_val(vma->vm_page_prot) &= _CACHEMASK040; | ||
22 | /* Use no-cache mode, serialized */ | ||
23 | pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S; | ||
24 | } | ||
25 | } | ||
26 | #endif /* CONFIG_SUN3 */ | ||
27 | |||
28 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-m68knommu/fb.h b/include/asm-m68knommu/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-m68knommu/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-mips/fb.h b/include/asm-mips/fb.h new file mode 100644 index 000000000000..ac23d96e261a --- /dev/null +++ b/include/asm-mips/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-parisc/fb.h b/include/asm-parisc/fb.h new file mode 100644 index 000000000000..d5e47edf5321 --- /dev/null +++ b/include/asm-parisc/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-powerpc/fb.h b/include/asm-powerpc/fb.h new file mode 100644 index 000000000000..e13d6ebc116d --- /dev/null +++ b/include/asm-powerpc/fb.h | |||
@@ -0,0 +1,15 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT, | ||
11 | vma->vm_end - vma->vm_start, | ||
12 | vma->vm_page_prot); | ||
13 | } | ||
14 | |||
15 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-s390/fb.h b/include/asm-s390/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-s390/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-sh/fb.h b/include/asm-sh/fb.h new file mode 100644 index 000000000000..4bf5b88d90bf --- /dev/null +++ b/include/asm-sh/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-sh64/fb.h b/include/asm-sh64/fb.h new file mode 100644 index 000000000000..4bf5b88d90bf --- /dev/null +++ b/include/asm-sh64/fb.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-sparc/fb.h b/include/asm-sparc/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-sparc/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h new file mode 100644 index 000000000000..8703c707e142 --- /dev/null +++ b/include/asm-sparc64/fb.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | #include <linux/fs.h> | ||
4 | #include <asm/page.h> | ||
5 | |||
6 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
7 | unsigned long off) | ||
8 | { | ||
9 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
10 | } | ||
11 | |||
12 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-v850/fb.h b/include/asm-v850/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-v850/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #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 000000000000..d30073c75586 --- /dev/null +++ b/include/asm-x86_64/fb.h | |||
@@ -0,0 +1,14 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | if (boot_cpu_data.x86 > 3) | ||
11 | pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; | ||
12 | } | ||
13 | |||
14 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-xtensa/fb.h b/include/asm-xtensa/fb.h new file mode 100644 index 000000000000..9f8c88d05df4 --- /dev/null +++ b/include/asm-xtensa/fb.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #define fb_pgprotect(...) do {} while (0) | ||
5 | |||
6 | #endif /* _ASM_FB_H_ */ | ||