Commit a011e213 authored Oct 17, 2014 by Anatol Pomozov Committed by Takashi Iwai Oct 18, 2014

ALSA: pcm: use the same dma mmap codepath both for arm and arm64



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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent c8b00fd2

sound/core/pcm_native.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3311,7 +3311,7 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {

	#ifndef ARCH_HAS_DMA_MMAP_COHERENT		#ifndef ARCH_HAS_DMA_MMAP_COHERENT
	/* This should be defined / handled globally! */		/* This should be defined / handled globally! */
	#ifdef CONFIG_ARM		#if defined(CONFIG_ARM) \|\| defined(CONFIG_ARM64)
	#define ARCH_HAS_DMA_MMAP_COHERENT		#define ARCH_HAS_DMA_MMAP_COHERENT
	#endif		#endif
	#endif		#endif

Admin message