#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"
* 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)
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))) {
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);
}