diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 13:19:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 13:19:49 +0100 |
| commit | 06f8dd05ff893d4b18d5690df0009a58a0df60c2 (patch) | |
| tree | d2373e7f2d78c516fd510464454f6f28ad5c4f67 | |
| parent | df020df35599a3b788468b469b1c845d49d469c2 (diff) | |
| parent | ab5308bde202e360e6f53182b01a8d724a0f3dae (diff) | |
| download | alsa-driver-build-unstable-06f8dd05ff893d4b18d5690df0009a58a0df60c2.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/acore/pcm_native.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/alsa/acore/pcm_native.patch b/alsa/acore/pcm_native.patch index 589981106..e83e2f3b3 100644 --- a/alsa/acore/pcm_native.patch +++ b/alsa/acore/pcm_native.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/core/pcm_native.c 2014-10-23 10:58:09.553942016 +0200 -+++ pcm_native.c 2014-10-23 11:04:04.004244088 +0200 +--- ../alsa-kernel/core/pcm_native.c 2014-10-24 15:57:36.584974948 +0200 ++++ pcm_native.c 2014-10-27 13:11:37.228723100 +0100 @@ -1,3 +1,7 @@ +#define __NO_VERSION__ +#include "adriver.h" @@ -414,24 +414,24 @@ }; /* -@@ -3324,6 +3536,8 @@ - area->vm_end - area->vm_start, area->vm_page_prot); +@@ -3325,6 +3537,8 @@ } #endif /* CONFIG_GENERIC_ALLOCATOR */ + #ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) || \ + defined(CONFIG_ARM) || defined(ARCH_HAS_DMA_MMAP_COHERENT) if (!substream->ops->page && substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) return dma_mmap_coherent(substream->dma_buffer.dev.dev, -@@ -3331,6 +3545,7 @@ +@@ -3332,6 +3546,7 @@ substream->runtime->dma_area, substream->runtime->dma_addr, area->vm_end - area->vm_start); +#endif + #endif /* CONFIG_X86 */ /* mmap with fault handler */ area->vm_ops = &snd_pcm_vm_ops_data_fault; - return 0; -@@ -3347,7 +3562,35 @@ +@@ -3349,7 +3564,35 @@ struct snd_pcm_runtime *runtime = substream->runtime;; area->vm_page_prot = pgprot_noncached(area->vm_page_prot); @@ -467,7 +467,7 @@ } EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem); -@@ -3381,7 +3624,7 @@ +@@ -3383,7 +3626,7 @@ runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) return -EINVAL; size = area->vm_end - area->vm_start; @@ -476,7 +476,7 @@ dma_bytes = PAGE_ALIGN(runtime->dma_bytes); if ((size_t)size > dma_bytes) return -EINVAL; -@@ -3412,7 +3655,7 @@ +@@ -3414,7 +3657,7 @@ if (PCM_RUNTIME_CHECK(substream)) return -ENXIO; @@ -485,7 +485,7 @@ switch (offset) { case SNDRV_PCM_MMAP_OFFSET_STATUS: if (pcm_file->no_compat_mmap) -@@ -3445,12 +3688,34 @@ +@@ -3447,12 +3690,34 @@ /* * ioctl32 compat */ @@ -521,7 +521,7 @@ /* * To be removed helpers to keep binary compatibility */ -@@ -3591,29 +3856,49 @@ +@@ -3593,29 +3858,49 @@ { .owner = THIS_MODULE, .write = snd_pcm_write, |