Commit 97384102 authored Apr 17, 2025 by gaoxu Committed by Greg Kroah-Hartman Jun 04, 2025

cgroup: Fix compilation issue due to cgroup_mutex not being exported



[ Upstream commit 87c259a7a359e73e6c52c68fcbec79988999b4e6 ]

When adding folio_memcg function call in the zram module for
Android16-6.12, the following error occurs during compilation:
ERROR: modpost: "cgroup_mutex" [../soc-repo/zram.ko] undefined!

This error is caused by the indirect call to lockdep_is_held(&cgroup_mutex)
within folio_memcg. The export setting for cgroup_mutex is controlled by
the CONFIG_PROVE_RCU macro. If CONFIG_LOCKDEP is enabled while
CONFIG_PROVE_RCU is not, this compilation error will occur.

To resolve this issue, add a parallel macro CONFIG_LOCKDEP control to
ensure cgroup_mutex is properly exported when needed.

Signed-off-by: gao xu <gaoxu2@honor.com>
Acked-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent c668e305

kernel/cgroup/cgroup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@
		DEFINE_MUTEX(cgroup_mutex);
		DEFINE_SPINLOCK(css_set_lock);

		#ifdef CONFIG_PROVE_RCU
		#if (defined CONFIG_PROVE_RCU \|\| defined CONFIG_LOCKDEP)
		EXPORT_SYMBOL_GPL(cgroup_mutex);
		EXPORT_SYMBOL_GPL(css_set_lock);
		#endif