From ffaeda21f89886bce03fecb3a3a48cedbd048253 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 27 Jul 2022 21:58:22 +0000 Subject: [PATCH] Revert "ANDROID: sched: gki: add padding to some structs to support WALT" This reverts commit 7a2a316228bcd80821a15fed6cd70c80a5daa182. Reason for revert: Fields are no longer needed for WALT Bug: 233898087 Change-Id: Ie21114707cd432bef3488bfb613c19a784a27172 Signed-off-by: Todd Kjos --- include/linux/arch_topology.h | 3 --- include/linux/sched/topology.h | 3 --- kernel/sched/sched.h | 6 ------ 3 files changed, 12 deletions(-) diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 1249429a0873..58cbe18d825c 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -7,7 +7,6 @@ #include #include -#include void topology_normalize_cpu_scale(void); int topology_update_cpu_topology(void); @@ -74,8 +73,6 @@ struct cpu_topology { cpumask_t core_sibling; cpumask_t cluster_sibling; cpumask_t llc_sibling; - - cpumask_t android_vendor_data1; }; #ifdef CONFIG_GENERIC_ARCH_TOPOLOGY diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index dcba7ee6ddb5..56cffe42abbc 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -3,7 +3,6 @@ #define _LINUX_SCHED_TOPOLOGY_H #include -#include #include @@ -82,8 +81,6 @@ struct sched_domain_shared { atomic_t ref; atomic_t nr_busy_cpus; int has_idle_cores; - - ANDROID_VENDOR_DATA(1); }; struct sched_domain { diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c0e3376048f2..160017a346db 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -434,8 +434,6 @@ struct task_group { struct uclamp_se uclamp[UCLAMP_CNT]; /* Latency-sensitive flag used for a task group */ unsigned int latency_sensitive; - - ANDROID_VENDOR_DATA_ARRAY(1, 4); #endif }; @@ -857,8 +855,6 @@ struct root_domain { * CPUs of the rd. Protected by RCU. */ struct perf_domain __rcu *pd; - - ANDROID_VENDOR_DATA_ARRAY(1, 4); }; extern void init_defrootdomain(void); @@ -1117,8 +1113,6 @@ struct rq { unsigned int core_forceidle_occupation; u64 core_forceidle_start; #endif - - ANDROID_VENDOR_DATA_ARRAY(1, 96); }; #ifdef CONFIG_FAIR_GROUP_SCHED