summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powernv/npu-dma.c
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2019-02-19 19:56:26 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2019-02-19 19:56:26 +1100
commit637cfeb9f99ca097747139a5419bc23e0b885655 (patch)
tree283fbe502c16ff79dfe93e10b565fc5c023be744 /arch/powerpc/platforms/powernv/npu-dma.c
parentb174b4fb919d118d9ac546b99a69574dfa431f7f (diff)
parenta58007621be33e9f7c7bed5d5ff8ecb914e1044a (diff)
downloadlinux-637cfeb9f99ca097747139a5419bc23e0b885655.tar.bz2
Merge branch 'fixes' into next
There's a few important fixes in our fixes branch, in particular the pgd/pud_present() one, so merge it now.
Diffstat (limited to 'arch/powerpc/platforms/powernv/npu-dma.c')
-rw-r--r--arch/powerpc/platforms/powernv/npu-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
index 2ca79823e3ba..bc06088d46bd 100644
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
@@ -560,7 +560,7 @@ struct iommu_table_group *pnv_try_setup_npu_table_group(struct pnv_ioda_pe *pe)
}
} else {
/* Create a group for 1 GPU and attached NPUs for POWER8 */
- pe->npucomp = kzalloc(sizeof(pe->npucomp), GFP_KERNEL);
+ pe->npucomp = kzalloc(sizeof(*pe->npucomp), GFP_KERNEL);
table_group = &pe->npucomp->table_group;
table_group->ops = &pnv_npu_peers_ops;
iommu_register_group(table_group, hose->global_number,