]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
x86/cpu/intel_epb: Don't rely on link order
authorJames Morse <james.morse@arm.com>
Fri, 24 Nov 2023 09:38:53 +0000 (09:38 +0000)
committerIngo Molnar <mingo@kernel.org>
Fri, 24 Nov 2023 12:54:31 +0000 (13:54 +0100)
intel_epb_init() is called as a subsys_initcall() to register cpuhp
callbacks. The callbacks make use of get_cpu_device() which will return
NULL unless register_cpu() has been called. register_cpu() is called
from topology_init(), which is also a subsys_initcall().

This is fragile. Moving the register_cpu() to a different
subsys_initcall() leads to a NULL dereference during boot.

Make intel_epb_init() a late_initcall(), user-space can't provide a
policy before this point anyway.

Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
arch/x86/kernel/cpu/intel_epb.c

index e4c3ba91321c95ad601d8e29f7439ab803c315a9..f18d35fe27a928690ed1d6c6d96a2468002c5690 100644 (file)
@@ -237,4 +237,4 @@ err_out_online:
        cpuhp_remove_state(CPUHP_AP_X86_INTEL_EPB_ONLINE);
        return ret;
 }
-subsys_initcall(intel_epb_init);
+late_initcall(intel_epb_init);