Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4852335b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Perf: arm64: Add additional CPUHP state for perf events"

parents 1213199c 5358c988

arch/arm64/kernel/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -1161,8 +1161,8 @@ static int perf_event_cpu_hp_init(void) 
{

	int ret;



	ret = cpuhp_setup_state_nocalls(CPUHP_AP_NOTIFY_ONLINE,

				"PERF_EVENT/CPUHP_AP_NOTIFY_ONLINE",

	ret = cpuhp_setup_state_nocalls(CPUHP_AP_NOTIFY_PERF_ONLINE,

				"PERF_EVENT/CPUHP_AP_NOTIFY_PERF_ONLINE",

				perf_event_hotplug_coming_up,

				perf_event_hotplug_going_down);

	if (ret)

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum cpuhp_state { 
	CPUHP_AP_WORKQUEUE_ONLINE,

	CPUHP_AP_RCUTREE_ONLINE,

	CPUHP_AP_NOTIFY_ONLINE,

	CPUHP_AP_NOTIFY_PERF_ONLINE,

	CPUHP_AP_ONLINE_DYN,

	CPUHP_AP_ONLINE_DYN_END		= CPUHP_AP_ONLINE_DYN + 30,

	CPUHP_AP_X86_HPET_ONLINE,