Messages in this thread | | | Subject | Re: [Linux-fbdev-devel] [PATCH 10/10] [HEADS UP] fbdev: Move arch-specific bits to their respective subdirectories | From | "Antonino A. Daplas" <> | Date | Thu, 17 May 2007 18:52:32 +0800 |
| |
On Thu, 2007-05-17 at 11:43 +0200, Geert Uytterhoeven wrote: > On Thu, 16 May 2007, Antonino A. Daplas wrote: > > diff --git a/include/asm-m68k/fb.h b/include/asm-m68k/fb.h > > new file mode 100644 > > index 0000000..7d4a28f > > --- /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) > > +{ > > + pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE; > > +} > > +#elif defined(CONFIG_MMU) > ^^^^^^^^^^^^^^^^^^^^^^^^^ > This can be a plain `#else', as m68knommu hasn't been merged with m68k > (yet :-) > > > +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma) > > + 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; > > + } > > +} > > +#else > ^^^^^ > So this branch can go away > > > +#warning What do we have to do here?? > > +#define fb_pgprotect(...) do {} while (0) > > +#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..dc9d1be > > --- /dev/null > > +++ b/include/asm-m68knommu/fb.h > > @@ -0,0 +1,7 @@ > > +#ifndef _ASM_FB_H_ > > +#define _ASM_FB_H_ > > + > > +#warning What do we have to do here?? > > +#define fb_pgprotect(...) do {} while (0) > > + > > +#endif /* _ASM_FB_H_ */ > > If the m68knommu case in fb_mmap() was empty before, it should be empty here > too, so I guess the warning can go away.
Thanks. It's confusing when there's multiple directories for one architecture.
Tony
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |