diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-04 09:20:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-04 09:20:57 +0200 |
| commit | bb76c823585b108b8e3ee9dfc5ef99dd4715ea9a (patch) | |
| tree | dacbaa591ea55a23f5fcee2119405ed9aae7738e /drivers/base/arch_numa.c | |
| parent | e5c044c8a9b65867369f8a4f3d5e3fee265d0487 (diff) | |
| parent | 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 (diff) | |
Merge 5.15-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/arch_numa.c')
| -rw-r--r-- | drivers/base/arch_numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c index 46c503486e96..00fb4120a5b3 100644 --- a/drivers/base/arch_numa.c +++ b/drivers/base/arch_numa.c @@ -264,7 +264,7 @@ void __init numa_free_distance(void) size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]); - memblock_free(__pa(numa_distance), size); + memblock_free_ptr(numa_distance, size); numa_distance_cnt = 0; numa_distance = NULL; } |