At Wed, 3 Sep 2008 16:38:54 +0800,
Bryan Wu wrote:
>
> From: Cliff Cai <cliff.cai@xxxxxxxxxx>
>
> 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@xxxxxxxxx>
> Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx>
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
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
