diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-12 12:39:59 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-12 12:39:59 +0300 |
commit | aaecd681f60fa02c7697198b308336a13b231f30 (patch) | |
tree | a6c6535d9553d63c4150dfe40669376e988f980f /drivers/cxl/core | |
parent | b84a9523bab4a2483d7b7566b81a7859c2fd9a78 (diff) | |
parent | 103a4e4a4351d3d5214c4f54fdf89f0f81b692ef (diff) | |
download | linux-aaecd681f60fa02c7697198b308336a13b231f30.tar.xz |
Merge v6.9.4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cxl/core')
-rw-r--r-- | drivers/cxl/core/region.c | 1 | ||||
-rw-r--r-- | drivers/cxl/core/trace.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 5c186e0a39b9..812b2948b6c6 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2719,6 +2719,7 @@ static struct cxl_pmem_region *cxl_pmem_region_alloc(struct cxl_region *cxlr) if (i == 0) { cxl_nvb = cxl_find_nvdimm_bridge(cxlmd); if (!cxl_nvb) { + kfree(cxlr_pmem); cxlr_pmem = ERR_PTR(-ENODEV); goto out; } diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h index e5f13260fc52..7c5cd069f10c 100644 --- a/drivers/cxl/core/trace.h +++ b/drivers/cxl/core/trace.h @@ -253,8 +253,8 @@ TRACE_EVENT(cxl_generic_event, * DRAM Event Record * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44 */ -#define CXL_DPA_FLAGS_MASK 0x3F -#define CXL_DPA_MASK (~CXL_DPA_FLAGS_MASK) +#define CXL_DPA_FLAGS_MASK GENMASK(1, 0) +#define CXL_DPA_MASK GENMASK_ULL(63, 6) #define CXL_DPA_VOLATILE BIT(0) #define CXL_DPA_NOT_REPAIRABLE BIT(1) |