ALSA: Merge memalloc code into snd-pcm module (2d82ea20) · Commits · 戴 / test

sound/core/Makefile

+4 −6

Original line number	Diff line number	Diff line
		@@ -10,14 +10,12 @@ snd-$(CONFIG_SND_VMASTER) += vmaster.o
		snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o
		snd-$(CONFIG_SND_JACK) += jack.o

		snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
		pcm_memory.o
		snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
		pcm_memory.o memalloc.o
		snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o

		snd-pcm-dmaengine-objs := pcm_dmaengine.o

		snd-page-alloc-y := memalloc.o
		snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o

		snd-rawmidi-objs := rawmidi.o
		snd-timer-objs := timer.o
		snd-hrtimer-objs := hrtimer.o
		@@ -31,7 +29,7 @@ obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
		obj-$(CONFIG_SND_TIMER) += snd-timer.o
		obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
		obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
		obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
		obj-$(CONFIG_SND_PCM) += snd-pcm.o
		obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
		obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o

+0 −10

Original line number	Diff line number	Diff line
		@@ -21,22 +21,12 @@
		*
		*/

		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/slab.h>
		#include <linux/mm.h>
		#include <asm/uaccess.h>
		#include <linux/dma-mapping.h>
		#include <linux/genalloc.h>
		#include <linux/moduleparam.h>
		#include <sound/memalloc.h>


		MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
		MODULE_DESCRIPTION("Memory allocator for ALSA system.");
		MODULE_LICENSE("GPL");


		/*
		*
		* Generic memory allocators