[PATCH] uClinux pgprot bits

ea29e98e · Christoph Hellwig · 9cab89d4 · ea29e98e · ea29e98e
Commit ea29e98e authored Nov 07, 2002 by Christoph Hellwig
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/char/mem.c drivers/char/mem.c +1 -1

drivers/video/fbmem.c drivers/video/fbmem.c +1 -1

No files found.
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -140,7 +140,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
 		prot |= _PAGE_PCD | _PAGE_PWT;
 #elif defined(__powerpc__)
 	prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
-#elif defined(__mc68000__)
+#elif defined(__mc68000__) && defined(CONFIG_MMU)
 #ifdef SUN3_PAGE_NOCACHE
 	if (MMU_IS_SUN3)
 		prot |= SUN3_PAGE_NOCACHE;

--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -612,7 +612,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 #if defined(__mc68000__)
 #if defined(CONFIG_SUN3)
 	pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
-#else
+#elif defined(CONFIG_MMU)
 	if (CPU_IS_020_OR_030)
 		pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
 	if (CPU_IS_040_OR_060) {