diff options
author | Michael Ellerman | 2019-01-04 12:07:47 +0100 |
---|---|---|
committer | Michael Ellerman | 2019-01-04 12:07:47 +0100 |
commit | d538d94f0ca86cfedc892cc427169219acb3c2f7 (patch) | |
tree | 8363c4ff35907edb5245da737d7f6982bf22b945 /arch/powerpc/kernel/eeh.c | |
parent | KVM: PPC: Book3S HV: radix: Fix uninitialized var build error (diff) | |
parent | Remove 'type' argument from access_ok() function (diff) | |
download | kernel-qcow2-linux-d538d94f0ca86cfedc892cc427169219acb3c2f7.tar.gz kernel-qcow2-linux-d538d94f0ca86cfedc892cc427169219acb3c2f7.tar.xz kernel-qcow2-linux-d538d94f0ca86cfedc892cc427169219acb3c2f7.zip |
Merge branch 'master' into fixes
We have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function"), so merge master to get it.
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
-rw-r--r-- | arch/powerpc/kernel/eeh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 3230137469ab..ae05203eb4de 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1472,7 +1472,7 @@ static int dev_has_iommu_table(struct device *dev, void *data) if (!dev) return 0; - if (dev->iommu_group) { + if (device_iommu_mapped(dev)) { *ppdev = pdev; return 1; } |