diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4ca1397de876..81366fc19677 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -99,7 +99,7 @@ struct walt_cpu_load { #define DECLARE_BITMAP_ARRAY(name, nr, bits) \ unsigned long name[nr][BITS_TO_LONGS(bits)] -extern unsigned int __weak sched_ravg_window; +extern unsigned int sched_ravg_window; struct walt_sched_stats { int nr_big_tasks; @@ -199,7 +199,7 @@ struct walt_sched_cluster { u64 aggr_grp_load; }; -extern __weak cpumask_t asym_cap_sibling_cpus; +extern cpumask_t asym_cap_sibling_cpus; #endif /* CONFIG_SCHED_WALT */ /* task_struct::on_rq states: */ @@ -2898,9 +2898,9 @@ struct walt_related_thread_group { extern struct walt_sched_cluster *sched_cluster[NR_CPUS]; extern unsigned int max_possible_capacity; -extern unsigned int __weak min_max_possible_capacity; -extern unsigned int __read_mostly __weak sched_init_task_load_windows; -extern unsigned int __read_mostly __weak sched_load_granule; +extern unsigned int min_max_possible_capacity; +extern unsigned int __read_mostly sched_init_task_load_windows; +extern unsigned int __read_mostly sched_load_granule; extern int update_preferred_cluster(struct walt_related_thread_group *grp, struct task_struct *p, u32 old_load, bool from_tick); @@ -3027,13 +3027,13 @@ static inline int same_freq_domain(int src_cpu, int dst_cpu) #define CPU_RESERVED 1 -extern enum sched_boost_policy __weak boost_policy; +extern enum sched_boost_policy boost_policy; static inline enum sched_boost_policy sched_boost_policy(void) { return boost_policy; } -extern unsigned int __weak sched_boost_type; +extern unsigned int sched_boost_type; static inline int sched_boost(void) { return sched_boost_type; diff --git a/kernel/sched/walt/trace.h b/kernel/sched/walt/trace.h index 4b3c111c313a..5b01043d2261 100644 --- a/kernel/sched/walt/trace.h +++ b/kernel/sched/walt/trace.h @@ -14,7 +14,7 @@ #ifdef CONFIG_SCHED_WALT struct rq; struct group_cpu_time; -extern const char __weak *task_event_names[]; +extern const char *task_event_names[]; TRACE_EVENT(sched_update_pred_demand, @@ -289,7 +289,7 @@ TRACE_EVENT(sched_update_task_ravg_mini, ); struct migration_sum_data; -extern const char __weak *migrate_type_names[]; +extern const char *migrate_type_names[]; TRACE_EVENT(sched_set_preferred_cluster, diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h index 25f7f3492dfc..9a678f0bbb68 100644 --- a/kernel/sched/walt/walt.h +++ b/kernel/sched/walt/walt.h @@ -13,9 +13,9 @@ #define EXITING_TASK_MARKER 0xdeaddead -extern unsigned int __weak walt_rotation_enabled; -extern int __read_mostly __weak num_sched_clusters; -extern cpumask_t __read_mostly __weak **cpu_array; +extern unsigned int walt_rotation_enabled; +extern int __read_mostly num_sched_clusters; +extern cpumask_t __read_mostly **cpu_array; extern void walt_update_task_ravg(struct task_struct *p, struct rq *rq, int event, u64 wallclock, u64 irqtime);