Merge branch 'linus'

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index df3a9e452cc5..ee73e30263af 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -23,6 +23,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
         page = alloc_pages(gfp, order);
         if (!page)
                 return NULL;
+        split_page(page, order);
 
         ret = page_address(page);
         *handle = virt_to_phys(ret);
@@ -37,8 +38,6 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
         end  = page + (1 << order);
 
         while (++page < end) {
-                set_page_count(page, 1);
-
                 /* Free any unused pages */
                 if (page >= free) {
                         __free_page(page);