Skip to content

Commit

Permalink
soc/qbman: Fix implicit header dependency now causing build fails
Browse files Browse the repository at this point in the history
In commit 461a694 ("iommu: Remove pci.h include from
trace/events/iommu.h") that header shuffle uncovered an implicit
include in this driver, manifesting as:

    CC      drivers/soc/fsl/qbman/qman_portal.o
    drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe':
    drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'dma_set_mask'
    drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'DMA_BIT_MASK'
        if (dma_set_mask(dev, DMA_BIT_MASK(40))) {
        ^

on the corenet32_smp_defconfig (and 64 bit respectively.)  The above
commit was singled out via git bisect.

The header it was implictly relying on getting was dma-mapping.h - so
we explicitly add it here.

Fixes: 461a694 ("iommu: Remove pci.h include from trace/events/iommu.h")
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Scott Wood <oss@buserror.net>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Paul Gortmaker authored and Joerg Roedel committed May 3, 2017
1 parent 208480b commit 4512c7b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/soc/fsl/qbman/qman_portal.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

#include "qman_priv.h"

#include <linux/dma-mapping.h>

struct qman_portal *qman_dma_portal;
EXPORT_SYMBOL(qman_dma_portal);

Expand Down

0 comments on commit 4512c7b

Please sign in to comment.