Merge branches 'gemini' and 'misc' into devel

1 files changed, 9 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 6215062caf8c..84d6367ec003 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -8,7 +8,8 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-debug.h>
-#include <linux/lmb.h>
+#include <linux/gfp.h>
+#include <linux/memblock.h>
 #include <asm/bug.h>
 #include <asm/abs_addr.h>
 
@@ -88,7 +89,7 @@ static int dma_direct_dma_supported(struct device *dev, u64 mask)
         /* Could be improved so platforms can set the limit in case
          * they have limited DMA windows
          */
-        return mask >= (lmb_end_of_DRAM() - 1);
+        return mask >= (memblock_end_of_DRAM() - 1);
 #else
         return 1;
 #endif
@@ -126,11 +127,11 @@ static inline void dma_direct_sync_sg(struct device *dev,
                 __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
 }
 
-static inline void dma_direct_sync_single_range(struct device *dev,
-                dma_addr_t dma_handle, unsigned long offset, size_t size,
-                enum dma_data_direction direction)
+static inline void dma_direct_sync_single(struct device *dev,
+                                          dma_addr_t dma_handle, size_t size,
+                                          enum dma_data_direction direction)
 {
-        __dma_sync(bus_to_virt(dma_handle+offset), size, direction);
+        __dma_sync(bus_to_virt(dma_handle), size, direction);
 }
 #endif
 
@@ -143,8 +144,8 @@ struct dma_map_ops dma_direct_ops = {
         .map_page       = dma_direct_map_page,
         .unmap_page     = dma_direct_unmap_page,
 #ifdef CONFIG_NOT_COHERENT_CACHE
-        .sync_single_range_for_cpu      = dma_direct_sync_single_range,
-        .sync_single_range_for_device   = dma_direct_sync_single_range,
+        .sync_single_for_cpu            = dma_direct_sync_single,
+        .sync_single_for_device         = dma_direct_sync_single,
         .sync_sg_for_cpu                = dma_direct_sync_sg,
         .sync_sg_for_device             = dma_direct_sync_sg,
 #endif