Commit ee817aca authored by Dan Williams's avatar Dan Williams
Browse files

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.
parents f57aec44 8a3d95ea

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/cxl/core/region.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

drivers/dax/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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