[PATCH 1/1] DSPGW: Fix build error with n800_defconfig

[PATCH 1/1] DSPGW: Fix build error with n800_defconfig

[Hiroshi DOYU]

"3c18ddd160d1fcd46d1131d9ad6c594dd8e9af99" removed "->nopage()" from "vm_ops".

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---
 drivers/dsp/dspgateway/task.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/dsp/dspgateway/task.c b/drivers/dsp/dspgateway/task.c
index e5ee8e0..e3a0a02 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)
-- 
1.5.4.3

Re: [PATCH 1/1] DSPGW: Fix build error with n800_defconfig

[Tony Lindgren]

* Hiroshi DOYU <Hiroshi.DOYU@nokia.com> [080506 03:43]:
> "3c18ddd160d1fcd46d1131d9ad6c594dd8e9af99" removed "->nopage()" from "vm_ops".
> 
> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
> ---
>  drivers/dsp/dspgateway/task.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/dsp/dspgateway/task.c b/drivers/dsp/dspgateway/task.c
> index e5ee8e0..e3a0a02 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)

Pushing.

Tony