diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 19:05:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 19:05:48 -0800 |
| commit | b297d520b9af536d5580ac505dd316be4cf5560c (patch) | |
| tree | a8f292b308c166ebd383b73fa09538775352c874 /mm/Makefile | |
| parent | c773633916c66f8362ca01983d97bd33e35b743f (diff) | |
| parent | e34f44b3517fe545f7fd45a8c2f6ee1e5e4432d3 (diff) | |
| download | linux-3.10-b297d520b9af536d5580ac505dd316be4cf5560c.tar.gz linux-3.10-b297d520b9af536d5580ac505dd316be4cf5560c.tar.bz2 linux-3.10-b297d520b9af536d5580ac505dd316be4cf5560c.zip | |
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
pool: Improve memory usage for devices which can't cross boundaries
Change dmapool free block management
dmapool: Tidy up includes and add comments
dmapool: Validate parameters to dma_pool_create
Avoid taking waitqueue lock in dmapool
dmapool: Fix style problems
Move dmapool.c to mm/ directory
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Makefile b/mm/Makefile index 44e2528af70..4af5dff3727 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -16,6 +16,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ obj-$(CONFIG_PROC_PAGE_MONITOR) += pagewalk.o obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o +obj-$(CONFIG_HAS_DMA) += dmapool.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o obj-$(CONFIG_NUMA) += mempolicy.o obj-$(CONFIG_SPARSEMEM) += sparse.o |