lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/nomm' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2010-05-20 11:59:09 +02:00
parent 3374cd1abd 55c63bd256
commit 7bd9db8308
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sound/core/pcm_native.c
View File

@@ -3440,14 +3440,28 @@ out:
#endif /* CONFIG_SND_SUPPORT_OLD_API */ #endif /* CONFIG_SND_SUPPORT_OLD_API */
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
unsigned long dummy_get_unmapped_area(struct file *file, unsigned long addr, static unsigned long snd_pcm_get_unmapped_area(struct file *file,
unsigned long len, unsigned long pgoff, unsigned long addr,
unsigned long flags) unsigned long len,
unsigned long pgoff,
unsigned long flags)
{ {
return 0; struct snd_pcm_file *pcm_file = file->private_data;
struct snd_pcm_substream *substream = pcm_file->substream;
struct snd_pcm_runtime *runtime = substream->runtime;
unsigned long offset = pgoff << PAGE_SHIFT;
switch (offset) {
case SNDRV_PCM_MMAP_OFFSET_STATUS:
return (unsigned long)runtime->status;
case SNDRV_PCM_MMAP_OFFSET_CONTROL:
return (unsigned long)runtime->control;
default:
return (unsigned long)runtime->dma_area + offset;
}
} }
#else #else
# define dummy_get_unmapped_area NULL # define snd_pcm_get_unmapped_area NULL
#endif #endif
/* /*
@@ -3467,7 +3481,7 @@ const struct file_operations snd_pcm_f_ops[2] = {
.compat_ioctl = snd_pcm_ioctl_compat, .compat_ioctl = snd_pcm_ioctl_compat,
.mmap = snd_pcm_mmap, .mmap = snd_pcm_mmap,
.fasync = snd_pcm_fasync, .fasync = snd_pcm_fasync,
.get_unmapped_area = dummy_get_unmapped_area, .get_unmapped_area = snd_pcm_get_unmapped_area,
}, },
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -3481,6 +3495,6 @@ const struct file_operations snd_pcm_f_ops[2] = {
.compat_ioctl = snd_pcm_ioctl_compat, .compat_ioctl = snd_pcm_ioctl_compat,
.mmap = snd_pcm_mmap, .mmap = snd_pcm_mmap,
.fasync = snd_pcm_fasync, .fasync = snd_pcm_fasync,
.get_unmapped_area = dummy_get_unmapped_area, .get_unmapped_area = snd_pcm_get_unmapped_area,
} }
}; };