tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k: merge the mmu and non-mmu versions of fb.h
Trivial merge of the mmu and non-mmu versions of fb.h
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+37
-50
+37
-4
arch/m68k/include/asm/fb.h
+37
-4
arch/m68k/include/asm/fb.h
···
1
-
#ifdef __uClinux__
2
-
#include "fb_no.h"
1
+
#ifndef _ASM_FB_H_
2
+
#define _ASM_FB_H_
3
+
4
+
#include <linux/fb.h>
5
+
#include <linux/fs.h>
6
+
#include <asm/page.h>
7
+
#include <asm/setup.h>
8
+
9
+
#ifdef CONFIG_MMU
10
+
#ifdef CONFIG_SUN3
11
+
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
12
+
unsigned long off)
13
+
{
14
+
pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
15
+
}
3
16
#else
4
-
#include "fb_mm.h"
5
-
#endif
17
+
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
18
+
unsigned long off)
19
+
{
20
+
if (CPU_IS_020_OR_030)
21
+
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
22
+
if (CPU_IS_040_OR_060) {
23
+
pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
24
+
/* Use no-cache mode, serialized */
25
+
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
26
+
}
27
+
}
28
+
#endif /* CONFIG_SUN3 */
29
+
#else
30
+
#define fb_pgprotect(...) do {} while (0)
31
+
#endif /* CONFIG_MMU */
32
+
33
+
static inline int fb_is_primary_device(struct fb_info *info)
34
+
{
35
+
return 0;
36
+
}
37
+
38
+
#endif /* _ASM_FB_H_ */
-34
arch/m68k/include/asm/fb_mm.h
-34
arch/m68k/include/asm/fb_mm.h
···
1
-
#ifndef _ASM_FB_H_
2
-
#define _ASM_FB_H_
3
-
4
-
#include <linux/fb.h>
5
-
#include <linux/fs.h>
6
-
#include <asm/page.h>
7
-
#include <asm/setup.h>
8
-
9
-
#ifdef CONFIG_SUN3
10
-
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
11
-
unsigned long off)
12
-
{
13
-
pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
14
-
}
15
-
#else
16
-
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
17
-
unsigned long off)
18
-
{
19
-
if (CPU_IS_020_OR_030)
20
-
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
21
-
if (CPU_IS_040_OR_060) {
22
-
pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
23
-
/* Use no-cache mode, serialized */
24
-
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
25
-
}
26
-
}
27
-
#endif /* CONFIG_SUN3 */
28
-
29
-
static inline int fb_is_primary_device(struct fb_info *info)
30
-
{
31
-
return 0;
32
-
}
33
-
34
-
#endif /* _ASM_FB_H_ */