Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / dsp / dspgateway / task.c

diff --git a/drivers/dsp/dspgateway/task.c b/drivers/dsp/dspgateway/task.c
index e5ee8e0e2169f02fdba094094ee1d9ff222b12fe..a371911bffa10cdb0e0388de1d50704208bfc59e 100644 (file)
--- a/drivers/dsp/dspgateway/task.c
+++ b/drivers/dsp/dspgateway/task.c
@@ -36,8 +36,8 @@
 #include <linux/kfifo.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/dsp.h>
+#include <mach/mailbox.h>
+#include <mach/dsp.h>
 #include "uaccess_dsp.h"
 #include "dsp_mbcmd.h"
 #include "dsp.h"
@@ -1311,16 +1311,15 @@ static void dsp_task_mmap_close(struct vm_area_struct *vma)
  * On demand page allocation is not allowed. The mapping area is defined by
  * corresponding DSP tasks.
  */
-static struct page *dsp_task_mmap_nopage(struct vm_area_struct *vma,
-                                        unsigned long address, int *type)
+static int dsp_task_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-       return NOPAGE_SIGBUS;
+       return VM_FAULT_NOPAGE;
 }
 
 static struct vm_operations_struct dsp_task_vm_ops = {
        .open = dsp_task_mmap_open,
        .close = dsp_task_mmap_close,
-       .nopage = dsp_task_mmap_nopage,
+       .fault = dsp_task_mmap_fault,
 };
 
 static int dsp_task_mmap(struct file *filp, struct vm_area_struct *vma)
@@ -1763,7 +1762,7 @@ static int taskdev_init(struct taskdev *dev, char *name, unsigned char minor)
                goto fail_create_proclist;
 
        task_dev = device_create(dsp_task_class, NULL,
-                                MKDEV(OMAP_DSP_TASK_MAJOR, minor),
+                                MKDEV(OMAP_DSP_TASK_MAJOR, minor), NULL,
                                 "dsptask%d", (int)minor);
 
        if (unlikely(IS_ERR(task_dev))) {
@@ -2831,7 +2830,7 @@ static ssize_t proc_list_show(struct device *d, struct device_attribute *attr,
        list_for_each_entry(pl, &dev->proc_list, list_head) {
                /* need to lock tasklist_lock before calling
                 * find_task_by_pid_type. */
-               if (find_task_by_pid(pl->pid) != NULL)
+               if (find_task_by_pid_type_ns(PIDTYPE_PID, pl->pid, &init_pid_ns) != NULL)
                        len += sprintf(buf + len, "%d\n", pl->pid);
                read_unlock(&tasklist_lock);
        }