From 81c0bf47a83d9f6df77c6594390c80ddd8fabea5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Sep 2024 06:20:12 +0000 Subject: [PATCH] ANDROID: fix up crc issue for cpuset_cpus_allowed() In commit 29a8d4e02fd4 ("cgroup/cpuset: Prevent UAF in proc_cpuset_show()"), a new .h file is added to kernel/cgroup/cpuset.c which ends up changing the CRC for cpuset_cpus_allowed(). Fix this up by only including it in the real build, not when generating the looney crc values. Fixes: 29a8d4e02fd4 ("cgroup/cpuset: Prevent UAF in proc_cpuset_show()") Change-Id: I151a87d3bae9f2319d1a965a4bf715cffead702e Signed-off-by: Greg Kroah-Hartman --- kernel/cgroup/cpuset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 1c49de3445b4..908a0d025e0f 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -21,8 +21,9 @@ * License. See the file COPYING in the main directory of the Linux * distribution for more details. */ +#ifndef __GENKSYMS__ #include "cgroup-internal.h" - +#endif #include #include #include