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

diff --combined drivers/base/Makefile
index 63e09c0,ed0a722..c666373
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -5,15 -5,12 +5,15 @@@ obj-y                 := core.o sys.o bus.o dd.o 
                           cpu.o firmware.o init.o map.o devres.o \
                           attribute_container.o transport_class.o
  obj-y                 += power/
- obj-$(CONFIG_HAS_DMA) += dma-mapping.o dmapool.o
+ obj-$(CONFIG_HAS_DMA) += dma-mapping.o
  obj-$(CONFIG_ISA)     += isa.o
  obj-$(CONFIG_FW_LOADER)       += firmware_class.o
  obj-$(CONFIG_NUMA)    += node.o
  obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
  obj-$(CONFIG_SMP)     += topology.o
 +ifeq ($(CONFIG_SYSFS),y)
 +obj-$(CONFIG_MODULES) += module.o
 +endif
  obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
  
  ifeq ($(CONFIG_DEBUG_DRIVER),y)

diff --combined mm/Makefile
index 44e2528,e222cc5..4af5dff
--- 1/mm/Makefile
--- 2/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