diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-01-27 13:31:58 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2020-01-27 13:31:58 -0500 |
| commit | b7fdcead5a738b986d74ba8c00be88fe7a44af74 (patch) | |
| tree | 9b2d6e2e109e12c2a33605c6de4aa8d61012dfc2 /meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch | |
| parent | 6aeb440d5e1e5155c866e91c3ec0f978122e8862 (diff) | |
meta-agl-profile-core: update most recipe
Update SRCREV in MOST driver recipe to pick up:
e4dbbaf sound.c: Remove snd_pcm_lib_mmap_vmalloc
As well, the following changes have been made to the bbappend:
- the kernel version detection logic has been removed
- the patch to support kernels older than 4.13 has been removed
- the patch that was handling the snd_pcm_lib_mmap_vmalloc issue on
kernels >= 4.19 has been reworked to add the required #ifdefs to
support kernels < 4.19 for e.g. the rcar3 4.14-ltsi kernel.
Bug-AGL: SPEC-2932
Change-Id: I388d186d04ccc017ff10b2024ae35ed22f7a8e36
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch')
| -rw-r--r-- | meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch b/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch index 8f83dbab4..d4383c4f6 100644 --- a/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch +++ b/meta-agl-profile-core/recipes-kernel/most/files/0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch @@ -1,18 +1,30 @@ Handle snd_pcm_lib_mmap_vmalloc removal in 4.19 -Upstream-Status: Pending +Add .mmap field back to pcm_ops for kernels older than 4.19. + +Upstream-Status: Inappropriate Signed-off-by: Scott Murray <scott.murray@konsulko.com> -diff --git a/driver/aim-sound/sound.c b/driver/aim-sound/sound.c -index 6a290ff..4b3329b 100644 +diff --git a/aim-sound/sound.c b/aim-sound/sound.c +index 4b3329b..c0a26be 100644 --- a/aim-sound/sound.c +++ b/aim-sound/sound.c -@@ -463,7 +463,6 @@ static const struct snd_pcm_ops pcm_ops = { +@@ -17,6 +17,7 @@ + #include <linux/printk.h> + #include <linux/kernel.h> + #include <linux/init.h> ++#include <linux/version.h> + #include <sound/core.h> + #include <sound/pcm.h> + #include <sound/pcm_params.h> +@@ -463,6 +464,9 @@ static const struct snd_pcm_ops pcm_ops = { .trigger = pcm_trigger, .pointer = pcm_pointer, .page = snd_pcm_lib_get_vmalloc_page, -- .mmap = snd_pcm_lib_mmap_vmalloc, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) ++ .mmap = snd_pcm_lib_mmap_vmalloc, ++#endif }; static int split_arg_list(char *buf, char **card_name, u16 *ch_num, |