xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: forward declare struct cgroup_taskset in vendor hooks

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

Bug: 233047575
Fixes: 1590a0e8e1 ("ANDROID: GKI: include more type definitions in vendor hooks")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I3139b63e5bea277c6687ce1c3c69db35059f3825
This commit is contained in:
Todd Kjos
2022-06-26 02:59:44 +00:00
parent 8d6d335851
commit abb407e9ff
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/trace/hooks/cgroup.h
View File

@@ -8,13 +8,11 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h> #include <trace/hooks/vendor_hooks.h>
#ifdef __GENKSYMS__
struct cgroup_taskset; struct cgroup_taskset;
#ifdef __GENKSYMS__
struct cgroup_subsys; struct cgroup_subsys;
struct task_struct; struct task_struct;
#else #else
/* struct cgroup_taskset */
#include <../kernel/cgroup/cgroup-internal.h>
/* struct cgroup_subsys */ /* struct cgroup_subsys */
#include <linux/cgroup-defs.h> #include <linux/cgroup-defs.h>
/* struct task_struct */ /* struct task_struct */

4
include/trace/hooks/sched.h
View File

@@ -10,8 +10,8 @@
* Following tracepoints are not exported in tracefs and provide a * Following tracepoints are not exported in tracefs and provide a
* mechanism for vendor modules to hook and extend functionality * mechanism for vendor modules to hook and extend functionality
*/ */
#ifdef __GENKSYMS__
struct cgroup_taskset; struct cgroup_taskset;
#ifdef __GENKSYMS__
struct cgroup_subsys_state; struct cgroup_subsys_state;
struct cpufreq_policy; struct cpufreq_policy;
struct em_perf_domain; struct em_perf_domain;
@@ -20,8 +20,6 @@ struct sched_entity;
struct task_struct; struct task_struct;
struct uclamp_se; struct uclamp_se;
#else #else
/* struct cgroup_taskset */
#include <../kernel/cgroup/cgroup-internal.h>
/* struct cgroup_subsys_state */ /* struct cgroup_subsys_state */
#include <linux/cgroup-defs.h> #include <linux/cgroup-defs.h>
/* struct cpufreq_policy */ /* struct cpufreq_policy */