diff --git a/[refs] b/[refs] index 8641f6fe5ff2..c0671935a1ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7c9d8520564eca89da8733e5248c7ce8ee8e1b0 +refs/heads/master: 7003609b3bdf0336c742974bd1ad2d82ffb3b043 diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index df2299a8cefd..e61e12506ded 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -3385,6 +3385,17 @@ static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream, } #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 */ @@ -3401,6 +3412,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, @@ -3413,5 +3425,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, } };