Merge branch 'master'

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c
index b566d982806c..8edee806dae7 100644
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
@@ -401,10 +401,10 @@ EXPORT_SYMBOL(__dma_sync);
 static inline void __dma_sync_page_highmem(struct page *page,
                 unsigned long offset, size_t size, int direction)
 {
-        size_t seg_size = min((size_t)PAGE_SIZE, size) - offset;
+        size_t seg_size = min((size_t)(PAGE_SIZE - offset), size);
         size_t cur_size = seg_size;
         unsigned long flags, start, seg_offset = offset;
-        int nr_segs = PAGE_ALIGN(size + (PAGE_SIZE - offset))/PAGE_SIZE;
+        int nr_segs = 1 + ((size - seg_size) + PAGE_SIZE - 1)/PAGE_SIZE;
         int seg_nr = 0;
 
         local_irq_save(flags);