Skip to contentSkip to conversation

ALSA: add dummy function to support shared mmap in nommu Blackfin arch (v3)

PATCH Applied Bryan Wu 2 participants 4 messages Sep 3, 2008 Sound

lore
Share & tools
lore

Bryan Wu

author
#0 lore raw

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

From: Cliff Cai <[email protected]>

v2-v3:
- when it is mmu arch, we define the dummy function to NULL

v1-v2:
- only adding this dummy function in nommu arch

---
 sound/core/pcm_native.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
sound/core/pcm_native.c +12 -0
index c49b9d9..e2068a4 100644
@@ -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,
 	}
 };
Signature · 1 line
1.5.6
Applied
#1 lore raw

At Wed, 3 Sep 2008 16:38:54 +0800,

Quoted 6 lines · Bryan Wu

From: Cliff Cai <[email protected]>

v2-v3:
- when it is mmu arch, we define the dummy function to NULL

Quoted 6 lines

v1-v2:
- only adding this dummy function in nommu arch

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

Takashi

Quoted 43 lines
---
 sound/core/pcm_native.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
sound/core/pcm_native.c +12 -0
index c49b9d9..e2068a4 100644
@@ -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,
 	}
 };
Signature · 1 line
1.5.6
author
#2 lore raw
Quoted 8 lines · Takashi Iwai

At Wed, 3 Sep 2008 16:38:54 +0800,

Quoted 6 lines · Bryan Wu

From: Cliff Cai <[email protected]>

v2-v3:
- when it is mmu arch, we define the dummy function to NULL

Quoted 10 lines
Quoted 6 lines

v1-v2:
- only adding this dummy function in nommu arch

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

#3 lore raw

At Wed, 3 Sep 2008 18:07:03 +0800,

Quoted 17 lines · Bryan Wu
Quoted 15 lines · Takashi Iwai

At Wed, 3 Sep 2008 16:38:54 +0800,

Quoted 12 lines · Bryan Wu

From: Cliff Cai <[email protected]>

v2-v3:
- when it is mmu arch, we define the dummy function to NULL

v1-v2:
- only adding this dummy function in nommu arch

Quoted 7 lines
Quoted 3 lines

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