diff options
| author | Dan Williams <[email protected]> | 2023-02-14 14:58:26 -0800 |
|---|---|---|
| committer | Dan Williams <[email protected]> | 2023-02-14 14:58:26 -0800 |
| commit | ee817acaa01d5c56e5fef396bea05c869b7e9351 (patch) | |
| tree | 32c3c60448806f3754f8b7853ba81666be8cee15 | |
| parent | f57aec443c24d2e8e1f3b5b4856aea12ddda4254 (diff) | |
| parent | 8a3d95ea42921a8021b2459e22f91b4f49495e57 (diff) | |
Merge branch 'for-6.3/cxl-ram-region' into cxl/next
Pick up some fixes from exposure of for-6.3/cxl-ram-region in
linux-next.
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/cxl/core/region.c | 5 | ||||
| -rw-r--r-- | drivers/dax/Kconfig | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index bdf1c66141c9..9beeee520073 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -71,7 +71,7 @@ obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ nfc/ obj-$(CONFIG_LIBNVDIMM) += nvdimm/ -obj-$(CONFIG_DAX) += dax/ +obj-y += dax/ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/ obj-$(CONFIG_NUBUS) += nubus/ obj-y += cxl/ diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index fe1d8392870e..f29028148806 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2625,10 +2625,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled) cxlr = to_cxl_region(region_dev); mutex_unlock(&cxlrd->range_lock); - if (IS_ERR(cxlr)) { - rc = PTR_ERR(cxlr); + rc = PTR_ERR_OR_ZERO(cxlr); + if (rc) goto out; - } attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE); diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig index bd06e16c7ac8..7e1008d756b8 100644 --- a/drivers/dax/Kconfig +++ b/drivers/dax/Kconfig @@ -47,7 +47,7 @@ config DEV_DAX_HMEM config DEV_DAX_CXL tristate "CXL DAX: direct access to CXL RAM regions" - depends on CXL_REGION && DEV_DAX + depends on CXL_BUS && CXL_REGION && DEV_DAX default CXL_REGION && DEV_DAX help CXL RAM regions are either mapped by platform-firmware |