From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 6 Feb 2008 03:05:48 +0000 (-0800)
Subject: Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
X-Git-Tag: v2.6.25-rc1~780
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b297d520b9af536d5580ac505dd316be4cf5560c;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'dmapool' of git://git./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
---

b297d520b9af536d5580ac505dd316be4cf5560c
diff --cc mm/Makefile
index 44e2528,e222cc5..4af5dff
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -13,9 -13,9 +13,10 @@@ obj-y			:= bootmem.o filemap.o mempool.
  			   prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
  			   page_isolation.o $(mmu-y)
  
 +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