diff --git a/[refs] b/[refs]
index 6872d85079b5..d7dbd82cb43a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b20c40dcca2d441f367da57e7665cce15c492a
+refs/heads/master: c80d9133e99de1af607314107910a2a1645efb17
diff --git a/trunk/arch/powerpc/kernel/dma_64.c b/trunk/arch/powerpc/kernel/dma_64.c
index 1d1dc76606ac..7b0e754383cf 100644
--- a/trunk/arch/powerpc/kernel/dma_64.c
+++ b/trunk/arch/powerpc/kernel/dma_64.c
@@ -120,14 +120,18 @@ unsigned long dma_direct_offset;
 static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
 				       dma_addr_t *dma_handle, gfp_t flag)
 {
+	struct page *page;
 	void *ret;
+	int node = dev->archdata.numa_node;
 
 	/* TODO: Maybe use the numa node here too ? */
-	ret = (void *)__get_free_pages(flag, get_order(size));
-	if (ret != NULL) {
-		memset(ret, 0, size);
-		*dma_handle = virt_to_abs(ret) | dma_direct_offset;
-	}
+	page = alloc_pages_node(node, flag, get_order(size));
+	if (page == NULL)
+		return NULL;
+	ret = page_address(page);
+	memset(ret, 0, size);
+	*dma_handle = virt_to_abs(ret) | dma_direct_offset;
+
 	return ret;
 }