| From a011e213f3700233ed2a676f1ef0a74a052d7162 Mon Sep 17 00:00:00 2001 |
| From: Anatol Pomozov <anatol.pomozov@gmail.com> |
| Date: Fri, 17 Oct 2014 12:43:34 -0700 |
| Subject: ALSA: pcm: use the same dma mmap codepath both for arm and arm64 |
| |
| From: Anatol Pomozov <anatol.pomozov@gmail.com> |
| |
| commit a011e213f3700233ed2a676f1ef0a74a052d7162 upstream. |
| |
| This avoids following kernel crash when try to playback on arm64 |
| |
| [ 107.497203] [<ffffffc00046b310>] snd_pcm_mmap_data_fault+0x90/0xd4 |
| [ 107.503405] [<ffffffc0001541ac>] __do_fault+0xb0/0x498 |
| [ 107.508565] [<ffffffc0001576a0>] handle_mm_fault+0x224/0x7b0 |
| [ 107.514246] [<ffffffc000092640>] do_page_fault+0x11c/0x310 |
| [ 107.519738] [<ffffffc000081100>] do_mem_abort+0x38/0x98 |
| |
| Tested: backported to 3.14 and tried to playback on arm64 machine |
| |
| Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/core/pcm_native.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/core/pcm_native.c |
| +++ b/sound/core/pcm_native.c |
| @@ -3197,7 +3197,7 @@ static const struct vm_operations_struct |
| |
| #ifndef ARCH_HAS_DMA_MMAP_COHERENT |
| /* This should be defined / handled globally! */ |
| -#ifdef CONFIG_ARM |
| +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) |
| #define ARCH_HAS_DMA_MMAP_COHERENT |
| #endif |
| #endif |
