Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / arch / x86 / events / rapl.c

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 8d98d468b97618b2646f43dd2a922db7677eb4b1..fb2b1961e5a33a190ab21ce6ea7d27026ffbc18e 100644 (file)
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -674,7 +674,7 @@ static const struct attribute_group *rapl_attr_update[] = {
 
 static int __init init_rapl_pmus(void)
 {
-       int maxdie = topology_max_packages() * topology_max_die_per_package();
+       int maxdie = topology_max_packages() * topology_max_dies_per_package();
        size_t size;
 
        size = sizeof(*rapl_pmus) + maxdie * sizeof(struct rapl_pmu *);