This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index aeeb1a7..54185b9 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -23,8 +23,6 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/ptrace.h>
 #include <linux/device.h>
-#include <linux/highmem.h>
-#include <linux/crash_dump.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -210,80 +208,29 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 
 static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
-#ifdef pgprot_noncached
        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
        int uncached;
 
        uncached = uncached_access(file, offset);
+#ifdef pgprot_noncached
        if (uncached)
                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 #endif
 
-       /* Remap-pfn-range will mark the range VM_IO and VM_RESERVED */
-       if (remap_pfn_range(vma,
-                           vma->vm_start,
-                           vma->vm_pgoff,
-                           vma->vm_end-vma->vm_start,
-                           vma->vm_page_prot))
-               return -EAGAIN;
-       return 0;
-}
-
-#ifdef CONFIG_CRASH_DUMP
-/*
- * Read memory corresponding to the old kernel.
- * If we are reading from the reserved section, which is
- * actually used by the current kernel, we just return zeroes.
- * Or if we are reading from the first 640k, we return from the
- * backed up area.
- */
-static ssize_t read_oldmem(struct file * file, char * buf,
-                               size_t count, loff_t *ppos)
-{
-       unsigned long pfn;
-       unsigned backup_start, backup_end, relocate_start;
-       size_t read=0, csize;
-
-       backup_start = CRASH_BACKUP_BASE / PAGE_SIZE;
-       backup_end = backup_start + (CRASH_BACKUP_SIZE / PAGE_SIZE);
-       relocate_start = (CRASH_BACKUP_BASE + CRASH_BACKUP_SIZE) / PAGE_SIZE;
-
-       while(count) {
-               pfn = *ppos / PAGE_SIZE;
-
-               csize = (count > PAGE_SIZE) ? PAGE_SIZE : count;
-
-               /* Perform translation (see comment above) */
-               if ((pfn >= backup_start) && (pfn < backup_end)) {
-                       if (clear_user(buf, csize)) {
-                               read = -EFAULT;
-                               goto done;
-                       }
-
-                       goto copy_done;
-               } else if (pfn < (CRASH_RELOCATE_SIZE / PAGE_SIZE))
-                       pfn += relocate_start;
-
-               if (pfn > saved_max_pfn) {
-                       read = 0;
-                       goto done;
-               }
+       /* Don't try to swap out physical pages.. */
+       vma->vm_flags |= VM_RESERVED;
 
-               if (copy_oldmem_page(pfn, buf, csize, 1)) {
-                       read = -EFAULT;
-                       goto done;
-               }
+       /*
+        * Don't dump addresses that are not real memory to a core file.
+        */
+       if (uncached)
+               vma->vm_flags |= VM_IO;
 
-copy_done:
-               buf += csize;
-               *ppos += csize;
-               read += csize;
-               count -= csize;
-       }
-done:
-       return read;
+       if (remap_page_range(vma, vma->vm_start, offset, vma->vm_end-vma->vm_start,
+                            vma->vm_page_prot))
+               return -EAGAIN;
+       return 0;
 }
-#endif
 
 extern long vread(char *buf, char *addr, unsigned long count);
 extern long vwrite(char *buf, char *addr, unsigned long count);
@@ -591,7 +538,6 @@ static int open_port(struct inode * inode, struct file * filp)
 #define read_full       read_zero
 #define open_mem       open_port
 #define open_kmem      open_mem
-#define open_oldmem    open_mem
 
 static struct file_operations mem_fops = {
        .llseek         = memory_lseek,
@@ -636,13 +582,6 @@ static struct file_operations full_fops = {
        .write          = write_full,
 };
 
-#ifdef CONFIG_CRASH_DUMP
-static struct file_operations oldmem_fops = {
-       .read   = read_oldmem,
-       .open   = open_oldmem,
-};
-#endif
-
 static ssize_t kmsg_write(struct file * file, const char __user * buf,
                          size_t count, loff_t *ppos)
 {
@@ -697,11 +636,6 @@ static int memory_open(struct inode * inode, struct file * filp)
                case 11:
                        filp->f_op = &kmsg_fops;
                        break;
-#ifdef CONFIG_CRASH_DUMP
-               case 12:
-                       filp->f_op = &oldmem_fops;
-                       break;
-#endif
                default:
                        return -ENXIO;
        }
@@ -730,9 +664,6 @@ static const struct {
        {8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
        {9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
        {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
-#ifdef CONFIG_CRASH_DUMP
-       {12,"oldmem",    S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops},
-#endif
 };
 
 static struct class_simple *mem_class;