Merge tag 'alsa-add-snd-sgbuf-aligned-pages' of... (fd563611) · Commits · 戴 / test

Merge tag 'alsa-add-snd-sgbuf-aligned-pages' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-4.19 ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally Make this helper inline function available for all platforms. This helps solve 0-day compilation issues when CONFIG_SND_DMA_SGBUF is not defined.

include/sound/memalloc.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -67,6 +67,14 @@ struct snd_dma_buffer {
		void private_data; / private for allocator; don't touch */
		};

		/*
		* return the pages matching with the given byte size
		*/
		static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
		{
		return (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
		}

		#ifdef CONFIG_SND_DMA_SGBUF
		/*
		* Scatter-Gather generic device pages
		@@ -90,14 +98,6 @@ struct snd_sg_buf {
		struct device *dev;
		};

		/*
		* return the pages matching with the given byte size
		*/
		static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
		{
		return (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
		}

		/*
		* return the physical address at the corresponding offset
		*/

Admin message