diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2025-11-13 08:42:46 -0700 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2025-11-13 08:42:46 -0700 |
| commit | 2be575434e420223dbdb68bbc717cb7af42c5c9b (patch) | |
| tree | f6484fb792c14452b0840ae8cd6229aa2c8b2133 /drivers/acpi | |
| parent | e9a6fb0bcdd7609be6969112f3fbfcce3b1d4a7c (diff) | |
| parent | 8d27dd0b219f00fc1e0548ae5008abd7bb350611 (diff) | |
Merge branch 'for-6.19/cxl-misc' into cxl-for-next
Misc patches for CXL 6.19
- Remove incorrect page-allocator quirk section in documentation.
- Remove unused devm_cxl_port_enumerate_dports() function.
- Fix typo in cdat.c code comment.
- Replace use of system_wq with system_percpu_wq
- Add locked decoder support
- Return when generic target updated
- Rename region_res_match_cxl_range() to spa_maps_hpa()
- Clarify comment in spa_maps_hpa()
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/numa/hmat.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 5a36d57289b4..1dc73d20d989 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -888,12 +888,13 @@ static void hmat_register_target(struct memory_target *target) * Register generic port perf numbers. The nid may not be * initialized and is still NUMA_NO_NODE. */ - mutex_lock(&target_lock); - if (*(u16 *)target->gen_port_device_handle) { - hmat_update_generic_target(target); - target->registered = true; + scoped_guard(mutex, &target_lock) { + if (*(u16 *)target->gen_port_device_handle) { + hmat_update_generic_target(target); + target->registered = true; + return; + } } - mutex_unlock(&target_lock); /* * Skip offline nodes. This can happen when memory |