aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bootconfig.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-04 09:20:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-04 09:20:57 +0200
commitbb76c823585b108b8e3ee9dfc5ef99dd4715ea9a (patch)
treedacbaa591ea55a23f5fcee2119405ed9aae7738e /lib/bootconfig.c
parente5c044c8a9b65867369f8a4f3d5e3fee265d0487 (diff)
parent9e1ff307c779ce1f0f810c7ecce3d95bbae40896 (diff)
downloadlinux-bb76c823585b108b8e3ee9dfc5ef99dd4715ea9a.tar.gz
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 'lib/bootconfig.c')
-rw-r--r--lib/bootconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index f8419cff1147..5ae248b29373 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -792,7 +792,7 @@ void __init xbc_destroy_all(void)
xbc_data = NULL;
xbc_data_size = 0;
xbc_node_num = 0;
- memblock_free(__pa(xbc_nodes), sizeof(struct xbc_node) * XBC_NODE_MAX);
+ memblock_free_ptr(xbc_nodes, sizeof(struct xbc_node) * XBC_NODE_MAX);
xbc_nodes = NULL;
brace_index = 0;
}