From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Antonino A. Daplas" Subject: Re: [PATCH 10/10] [HEADS UP] fbdev: Move arch-specific bits to their respective subdirectories Date: Thu, 17 May 2007 18:52:32 +0800 Message-ID: <1179399152.4586.13.camel@daplas> References: <464B78BC.4080900@gmail.com> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1Hodb7-0007LJ-Cg for linux-fbdev-devel@lists.sourceforge.net; Thu, 17 May 2007 03:52:41 -0700 Received: from nz-out-0506.google.com ([64.233.162.238]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1Hodb7-0000BG-4C for linux-fbdev-devel@lists.sourceforge.net; Thu, 17 May 2007 03:52:41 -0700 Received: by nz-out-0506.google.com with SMTP id i11so812522nzi for ; Thu, 17 May 2007 03:52:40 -0700 (PDT) In-Reply-To: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: linux-fbdev-devel@lists.sourceforge.net Cc: Andrew Morton , Linux/m68k , Linux Kernel Development , uClinux list 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 > > +#include > > +#include > > + > > +#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 ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/