[PATCH] page zero is not mapped on m68knommu

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 97777caf5d775298a585a091ec33df609f95d359..97e585a9036185bb7889fb4b06ca1a1640967f89 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -49,7 +49,7 @@ static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp,
        ssize_t written;
 
        written = 0;
-#if defined(__sparc__) || defined(__mc68000__)
+#if defined(__sparc__) || (defined(__mc68000__) && defined(CONFIG_MMU))
        /* we don't have page 0 mapped on sparc and m68k.. */
        if (realp < PAGE_SIZE) {
                unsigned long sz = PAGE_SIZE-realp;
@@ -86,7 +86,7 @@ static ssize_t read_mem(struct file * file, char * buf,
        if (count > end_mem - p)
                count = end_mem - p;
        read = 0;
-#if defined(__sparc__) || defined(__mc68000__)
+#if defined(__sparc__) || (defined(__mc68000__) && defined(CONFIG_MMU))
        /* we don't have page 0 mapped on sparc and m68k.. */
        if (p < PAGE_SIZE) {
                unsigned long sz = PAGE_SIZE-p;
@@ -229,7 +229,7 @@ static ssize_t read_kmem(struct file *file, char *buf,
                if (count > (unsigned long) high_memory - p)
                        read = (unsigned long) high_memory - p;
 
-#if defined(__sparc__) || defined(__mc68000__)
+#if defined(__sparc__) || (defined(__mc68000__) && defined(CONFIG_MMU))
                /* we don't have page 0 mapped on sparc and m68k.. */
                if (p < PAGE_SIZE && read > 0) {
                        size_t tmp = PAGE_SIZE - p;