summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/fsl_pamu.h
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2017-08-23 16:28:09 +0200
committerJoerg Roedel <jroedel@suse.de>2017-08-23 16:28:09 +0200
commit3ff2dcc058946c48afd3f2c8cd9e3a880b466c5b (patch)
treec22d36b858dde810a04ad9a1153dca04741185b4 /drivers/iommu/fsl_pamu.h
parent68a17f0be6feb8de1f5e26b93f49791031374c4c (diff)
downloadlinux-stable-3ff2dcc058946c48afd3f2c8cd9e3a880b466c5b.tar.gz
linux-stable-3ff2dcc058946c48afd3f2c8cd9e3a880b466c5b.tar.bz2
linux-stable-3ff2dcc058946c48afd3f2c8cd9e3a880b466c5b.zip
iommu/pamu: Fix PAMU boot crash
Commit 68a17f0be6fe introduced an initialization order problem, where devices are linked against an iommu which is not yet initialized. Fix it by initializing the iommu-device before the iommu-ops are registered against the bus. Reported-by: Michael Ellerman <mpe@ellerman.id.au> Fixes: 68a17f0be6fe ('iommu/pamu: Add support for generic iommu-device') Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/fsl_pamu.h')
-rw-r--r--drivers/iommu/fsl_pamu.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/iommu/fsl_pamu.h b/drivers/iommu/fsl_pamu.h
index fa48222f3421..c3434f29c967 100644
--- a/drivers/iommu/fsl_pamu.h
+++ b/drivers/iommu/fsl_pamu.h
@@ -391,9 +391,6 @@ struct ome {
#define EOE_WWSAOL 0x1e /* Write with stash allocate only and lock */
#define EOE_VALID 0x80
-extern const struct iommu_ops fsl_pamu_ops;
-extern struct iommu_device pamu_iommu; /* IOMMU core code handle */
-
/* Function prototypes */
int pamu_domain_init(void);
int pamu_enable_liodn(int liodn);