Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 146b7cdb authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 4892242a

arch/m68k/include/asm/fb.h

+37 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "fb_no.h"

#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <linux/fb.h>

#include <linux/fs.h>

#include <asm/page.h>

#include <asm/setup.h>



#ifdef CONFIG_MMU

#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

#include "fb_mm.h"

#endif
 
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 */

#else

#define fb_pgprotect(...) do {} while (0)

#endif /* CONFIG_MMU */



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */

arch/m68k/include/asm/fb_mm.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <linux/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 */



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */

arch/m68k/include/asm/fb_no.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_

#include <linux/fb.h>



#define fb_pgprotect(...) do {} while (0)



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */