[PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

[PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

[Bryan Wu]

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>
---
 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

Re: [PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

[Takashi Iwai]

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
> 

Re: [alsa-devel] [PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

[Bryan Wu]

On Wed, Sep 3, 2008 at 5:26 PM, Takashi Iwai <tiwai@suse.de> wrote:
> 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.
>
>

Thanks a lot. But I found the author of this patch was me not Cliff in
the sound-2.6.git.
Could you please change the author to Cliff, cause he is the original bug fixer.

-Bryan

Re: [alsa-devel] [PATCH 1/1] ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

[Takashi Iwai]

At Wed, 3 Sep 2008 18:07:03 +0800,
Bryan Wu wrote:
> 
> On Wed, Sep 3, 2008 at 5:26 PM, Takashi Iwai <tiwai@suse.de> wrote:
> > 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.
> >
> >
> 
> Thanks a lot. But I found the author of this patch was me not Cliff in
> the sound-2.6.git.
> Could you please change the author to Cliff, cause he is the original bug fixer.

Oh, sorry, something wrong with my script.
Fixed and pushed now.

thanks,

Takashi