diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-07-19 14:37:57 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-07-19 14:37:57 +1000 |
| commit | ce57c6610cc2d7cde61fc005a2d2090bce46fc73 (patch) | |
| tree | be1230fb1773e3de7fb7f6a0adde68ca0468273e /drivers/misc/cxl/cxl.h | |
| parent | 9c3250a127901c93b23723dc5859c71a0d068fb8 (diff) | |
| parent | a68bd1267b7286b1687905651b404e765046de25 (diff) | |
Merge branch 'topic/ppc-kvm' into next
Merge in some commits we're sharing with the KVM tree.
I manually propagated the change from commit d3d4ffaae439
("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into
pci-ioda-tce.c.
Conflicts:
arch/powerpc/include/asm/cputable.h
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.h
Diffstat (limited to 'drivers/misc/cxl/cxl.h')
| -rw-r--r-- | drivers/misc/cxl/cxl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h index 44bcfafbb579..d1d927ccb589 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h @@ -850,14 +850,6 @@ static inline bool cxl_is_power9(void) return false; } -static inline bool cxl_is_power9_dd1(void) -{ - if ((pvr_version_is(PVR_POWER9)) && - cpu_has_feature(CPU_FTR_POWER9_DD1)) - return true; - return false; -} - ssize_t cxl_pci_afu_read_err_buffer(struct cxl_afu *afu, char *buf, loff_t off, size_t count); |