Commit b8dedbc2 authored Oct 06, 2022 by Todd Kjos

ANDROID: Fix kenelci build-break for !CONFIG_PERF_EVENTS

Kernelci builds were broken if !CONFIG_PERF_EVENTS since 467eb53a ("ANDROID: cpu/hotplug:
avoid breaking Android ABI by fusing cpuhp steps") causes
perf_event_init_cpu(cpu) to be reduced to "NULL(cpu)":

kernel/cpu.c:1868:21: error: called object type 'void *' is not a function or function pointer

Fixes: 467eb53a ("ANDROID: cpu/hotplug: avoid breaking Android ABI by fusing cpuhp steps")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: Ifc7351f74470c87018770395af4b4f6096f0d73f

parent c1957fce

kernel/cpu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1449,7 +1449,9 @@ int __boot_cpu_id;
		/* Horrific hacks because we can't add more to cpuhp_hp_states. */
		static int random_and_perf_prepare_fusion(unsigned int cpu)
		{
		#ifdef CONFIG_PERF_EVENTS
		perf_event_init_cpu(cpu);
		#endif
		random_prepare_cpu(cpu);
		return 0;
		}