Blackfin: fix cache Kconfig typo

[safe/jmp/linux-2.6] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index afa8813..a074fce 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -301,7 +301,7 @@ static inline int private_mapping_ok(struct vm_area_struct *vma)
 }
 #endif
 
-static struct vm_operations_struct mmap_mem_ops = {
+static const struct vm_operations_struct mmap_mem_ops = {
 #ifdef CONFIG_HAVE_IOREMAP_PROT
        .access = generic_access_phys
 #endif
@@ -690,7 +690,7 @@ static ssize_t read_zero(struct file * file, char __user * buf,
 
                if (chunk > PAGE_SIZE)
                        chunk = PAGE_SIZE;      /* Just for latency reasons */
-               unwritten = clear_user(buf, chunk);
+               unwritten = __clear_user(buf, chunk);
                written += chunk - unwritten;
                if (unwritten)
                        break;
@@ -822,6 +822,7 @@ static const struct file_operations zero_fops = {
  * - permits private mappings, "copies" are taken of the source of zeros
  */
 static struct backing_dev_info zero_bdi = {
+       .name           = "char/mem",
        .capabilities   = BDI_CAP_MAP_COPY,
 };
 
@@ -863,71 +864,75 @@ static const struct file_operations kmsg_fops = {
        .write =        kmsg_write,
 };
 
-static const struct {
-       unsigned int            minor;
-       char                    *name;
-       umode_t                 mode;
-       const struct file_operations    *fops;
-       struct backing_dev_info *dev_info;
-} devlist[] = { /* list of minor devices */
-       {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops,
-               &directly_mappable_cdev_bdi},
+static const struct memdev {
+       const char *name;
+       mode_t mode;
+       const struct file_operations *fops;
+       struct backing_dev_info *dev_info;
+} devlist[] = {
+        [1] = { "mem", 0, &mem_fops, &directly_mappable_cdev_bdi },
 #ifdef CONFIG_DEVKMEM
-       {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops,
-               &directly_mappable_cdev_bdi},
+        [2] = { "kmem", 0, &kmem_fops, &directly_mappable_cdev_bdi },
 #endif
-       {3, "null",    S_IRUGO | S_IWUGO,           &null_fops, NULL},
+        [3] = { "null", 0666, &null_fops, NULL },
 #ifdef CONFIG_DEVPORT
-       {4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops, NULL},
+        [4] = { "port", 0, &port_fops, NULL },
 #endif
-       {5, "zero",    S_IRUGO | S_IWUGO,           &zero_fops, &zero_bdi},
-       {7, "full",    S_IRUGO | S_IWUGO,           &full_fops, NULL},
-       {8, "random",  S_IRUGO | S_IWUSR,           &random_fops, NULL},
-       {9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops, NULL},
-       {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops, NULL},
+        [5] = { "zero", 0666, &zero_fops, &zero_bdi },
+        [7] = { "full", 0666, &full_fops, NULL },
+        [8] = { "random", 0666, &random_fops, NULL },
+        [9] = { "urandom", 0666, &urandom_fops, NULL },
+       [11] = { "kmsg", 0, &kmsg_fops, NULL },
 #ifdef CONFIG_CRASH_DUMP
-       {12,"oldmem",    S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops, NULL},
+       [12] = { "oldmem", 0, &oldmem_fops, NULL },
 #endif
 };
 
 static int memory_open(struct inode *inode, struct file *filp)
 {
-       int ret = 0;
-       int i;
+       int minor;
+       const struct memdev *dev;
+       int ret = -ENXIO;
 
        lock_kernel();
 
-       for (i = 0; i < ARRAY_SIZE(devlist); i++) {
-               if (devlist[i].minor == iminor(inode)) {
-                       filp->f_op = devlist[i].fops;
-                       if (devlist[i].dev_info) {
-                               filp->f_mapping->backing_dev_info =
-                                       devlist[i].dev_info;
-                       }
+       minor = iminor(inode);
+       if (minor >= ARRAY_SIZE(devlist))
+               goto out;
 
-                       break;
-               }
-       }
+       dev = &devlist[minor];
+       if (!dev->fops)
+               goto out;
 
-       if (i == ARRAY_SIZE(devlist))
-               ret = -ENXIO;
-       else
-               if (filp->f_op && filp->f_op->open)
-                       ret = filp->f_op->open(inode, filp);
+       filp->f_op = dev->fops;
+       if (dev->dev_info)
+               filp->f_mapping->backing_dev_info = dev->dev_info;
 
+       if (dev->fops->open)
+               ret = dev->fops->open(inode, filp);
+       else
+               ret = 0;
+out:
        unlock_kernel();
        return ret;
 }
 
 static const struct file_operations memory_fops = {
-       .open           = memory_open,  /* just a selector for the real open */
+       .open           = memory_open,
 };
 
+static char *mem_devnode(struct device *dev, mode_t *mode)
+{
+       if (mode && devlist[MINOR(dev->devt)].mode)
+               *mode = devlist[MINOR(dev->devt)].mode;
+       return NULL;
+}
+
 static struct class *mem_class;
 
 static int __init chr_dev_init(void)
 {
-       int i;
+       int minor;
        int err;
 
        err = bdi_init(&zero_bdi);
@@ -938,10 +943,13 @@ static int __init chr_dev_init(void)
                printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
        mem_class = class_create(THIS_MODULE, "mem");
-       for (i = 0; i < ARRAY_SIZE(devlist); i++)
-               device_create(mem_class, NULL,
-                             MKDEV(MEM_MAJOR, devlist[i].minor), NULL,
-                             devlist[i].name);
+       mem_class->devnode = mem_devnode;
+       for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
+               if (!devlist[minor].name)
+                       continue;
+               device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
+                             NULL, devlist[minor].name);
+       }
 
        return 0;
 }