From: Suresh B Siddha

Coresponding change to IA64 code is in, so this can be merged too.

- fallback to swiotlb for consistent DMA mappings
- fix a memory leak in dma_alloc_coherent
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>