From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754129AbYICJ0h@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754129AbYICJ0h (ORCPT <rfc822;w@1wt.eu>);
	Wed, 3 Sep 2008 05:26:37 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750773AbYICJ03
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 3 Sep 2008 05:26:29 -0400
Received: from mx2.suse.de ([195.135.220.15]:42564 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751630AbYICJ03 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 3 Sep 2008 05:26:29 -0400
Date: Wed, 03 Sep 2008 11:26:27 +0200
Message-ID: <s5hd4jlpol8.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Bryan Wu <cooloney@kernel.org>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
       Cliff Cai <cliff.cai@analog.com>, Mike Frysinger <vapier.adi@gmail.com>
Subject: Re: [PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)
In-Reply-To: <1220431134-7797-1-git-send-email-cooloney@kernel.org>
References: <1220431134-7797-1-git-send-email-cooloney@kernel.org>
User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2
 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Wed,  3 Sep 2008 16:38:54 +0800,
Bryan Wu wrote:
> 
> From: Cliff Cai <cliff.cai@analog.com>
> 
> v2-v3:
>  - when it is mmu arch, we define the dummy function to NULL
> 
> v1-v2:
>  - only adding this dummy function in nommu arch
> 
> Cc: Mike Frysinger <vapier.adi@gmail.com>
> Signed-off-by: Cliff Cai <cliff.cai@analog.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>

Thanks, applied now with a slight fix of coding style.


Takashi

> ---
>  sound/core/pcm_native.c |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index c49b9d9..e2068a4 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -3391,6 +3391,16 @@ out:
>  }
>  #endif /* CONFIG_SND_SUPPORT_OLD_API */
>  
> +#ifndef CONFIG_MMU
> +unsigned long dummy_get_unmapped_area(struct file *file, unsigned long addr,
> +				      unsigned long len, unsigned long pgoff, unsigned long flags)
> +{
> +	return 0;
> +}
> +#else
> +# define dummy_get_unmapped_area NULL
> +#endif
> +
>  /*
>   *  Register section
>   */
> @@ -3407,6 +3417,7 @@ const struct file_operations snd_pcm_f_ops[2] = {
>  		.compat_ioctl = 	snd_pcm_ioctl_compat,
>  		.mmap =			snd_pcm_mmap,
>  		.fasync =		snd_pcm_fasync,
> +		.get_unmapped_area =	dummy_get_unmapped_area,
>  	},
>  	{
>  		.owner =		THIS_MODULE,
> @@ -3419,5 +3430,6 @@ const struct file_operations snd_pcm_f_ops[2] = {
>  		.compat_ioctl = 	snd_pcm_ioctl_compat,
>  		.mmap =			snd_pcm_mmap,
>  		.fasync =		snd_pcm_fasync,
> +		.get_unmapped_area =	dummy_get_unmapped_area,
>  	}
>  };
> -- 
> 1.5.6
>