From: Hiroshi DOYU Date: Tue, 6 May 2008 10:42:41 +0000 (+0300) Subject: DSPGW: Fix build error with n800_defconfig X-Git-Tag: v2.6.26-omap1~123^2~141 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a301a3ae626928530d51e70eed73916db63f784b;p=linux-2.6-omap-h63xx.git DSPGW: Fix build error with n800_defconfig "3c18ddd160d1fcd46d1131d9ad6c594dd8e9af99" removed "->nopage()" from "vm_ops". Signed-off-by: Hiroshi DOYU Signed-off-by: Tony Lindgren --- diff --git a/drivers/dsp/dspgateway/task.c b/drivers/dsp/dspgateway/task.c index e5ee8e0e216..e3a0a02a103 100644 --- a/drivers/dsp/dspgateway/task.c +++ b/drivers/dsp/dspgateway/task.c @@ -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)