From abb407e9ff95013b31f99b475be09f782717e141 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Sun, 26 Jun 2022 02:59:44 +0000
Subject: [PATCH] ANDROID: GKI: forward declare struct cgroup_taskset in vendor
 hooks

The inclusion of the internal kernel/cgroup/cgroup-internal.h header
broke some androidci builds.

Bug: 233047575
Fixes: 1590a0e8e123 ("ANDROID: GKI: include more type definitions in vendor hooks")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I3139b63e5bea277c6687ce1c3c69db35059f3825
---
 include/trace/hooks/cgroup.h | 4 +---
 include/trace/hooks/sched.h  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h
index 8d838c389703..68818ad29600 100644
--- a/include/trace/hooks/cgroup.h
+++ b/include/trace/hooks/cgroup.h
@@ -8,13 +8,11 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-#ifdef __GENKSYMS__
 struct cgroup_taskset;
+#ifdef __GENKSYMS__
 struct cgroup_subsys;
 struct task_struct;
 #else
-/* struct cgroup_taskset */
-#include <../kernel/cgroup/cgroup-internal.h>
 /* struct cgroup_subsys */
 #include <linux/cgroup-defs.h>
 /* struct task_struct */
diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h
index c3fc9bf6f8e9..9f16fffd89e4 100644
--- a/include/trace/hooks/sched.h
+++ b/include/trace/hooks/sched.h
@@ -10,8 +10,8 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#ifdef __GENKSYMS__
 struct cgroup_taskset;
+#ifdef __GENKSYMS__
 struct cgroup_subsys_state;
 struct cpufreq_policy;
 struct em_perf_domain;
@@ -20,8 +20,6 @@ struct sched_entity;
 struct task_struct;
 struct uclamp_se;
 #else
-/* struct cgroup_taskset */
-#include <../kernel/cgroup/cgroup-internal.h>
 /* struct cgroup_subsys_state */
 #include <linux/cgroup-defs.h>
 /* struct cpufreq_policy */