Pull remove-hotkey into release branch

[linux-2.6-omap-h63xx.git] / arch / sh / mm / consistent.c

diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index c81e6b67ad300e9e8b23c5adfc1658184d1ea59e..38c82d890ffda6a5cb332ad3b387bde0476dc551 100644 (file)
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -28,6 +28,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
        split_page(page, order);
 
        ret = page_address(page);
+       memset(ret, 0, size);
        *handle = virt_to_phys(ret);
 
        /*