Convert iommu/fsl_pamu.c to use the new page allocation functions
provided in iommu-pages.h.

Signed-off-by: Pasha Tatashin <pasha.tatas...@soleen.com>
---
 drivers/iommu/fsl_pamu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index f37d3b044131..7bfb49940f0c 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/mpc85xx.h>
+#include "iommu-pages.h"
 
 /* define indexes for each operation mapping scenario */
 #define OMI_QMAN        0x00
@@ -828,7 +829,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
                (PAGE_SIZE << get_order(OMT_SIZE));
        order = get_order(mem_size);
 
-       p = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
+       p = __iommu_alloc_pages(GFP_KERNEL, order);
        if (!p) {
                dev_err(dev, "unable to allocate PAACT/SPAACT/OMT block\n");
                ret = -ENOMEM;
@@ -916,7 +917,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
                iounmap(guts_regs);
 
        if (ppaact)
-               free_pages((unsigned long)ppaact, order);
+               iommu_free_pages(ppaact, order);
 
        ppaact = NULL;
 
-- 
2.43.0.rc2.451.g8631bc7472-goog


Reply via email to