Merge "sched: Provide stub definitions for WALT" (06547e6f) · Commits · e / devices / android_kernel_fairphone_FP5

fs/proc/base.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -1464,12 +1464,6 @@ static const struct file_operations proc_pid_sched_operations = {
		*/

		#ifdef CONFIG_SCHED_WALT
		extern int __weak sched_wake_up_idle_show(struct seq_file m, void v);
		extern ssize_t __weak sched_wake_up_idle_write(struct file *file,
		const char __user buf, size_t count, loff_t offset);
		extern int __weak sched_wake_up_idle_open(struct inode *inode,
		struct file *filp);

		static const struct file_operations proc_pid_sched_wake_up_idle_operations = {
		.open = sched_wake_up_idle_open,
		.read = seq_read,
		@@ -1478,13 +1472,6 @@ static const struct file_operations proc_pid_sched_wake_up_idle_operations = {
		.release = single_release,
		};

		extern int __weak sched_init_task_load_show(struct seq_file m, void v);
		extern ssize_t __weak
		sched_init_task_load_write(struct file file, const char __user buf,
		size_t count, loff_t *offset);
		extern int __weak
		sched_init_task_load_open(struct inode inode, struct file filp);

		static const struct file_operations proc_pid_sched_init_task_load_operations = {
		.open = sched_init_task_load_open,
		.read = seq_read,
		@@ -1493,12 +1480,6 @@ static const struct file_operations proc_pid_sched_init_task_load_operations = {
		.release = single_release,
		};

		extern int __weak sched_group_id_show(struct seq_file m, void v);
		extern ssize_t __weak
		sched_group_id_write(struct file file, const char __user buf,
		size_t count, loff_t *offset);
		extern int __weak sched_group_id_open(struct inode inode, struct file filp);

		static const struct file_operations proc_pid_sched_group_id_operations = {
		.open = sched_group_id_open,
		.read = seq_read,

include/linux/sched.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -248,9 +248,9 @@ enum migrate_types {
		};

		#ifdef CONFIG_HOTPLUG_CPU
		extern int __weak sched_isolate_cpu(int cpu);
		extern int __weak sched_unisolate_cpu(int cpu);
		extern int __weak sched_unisolate_cpu_unlocked(int cpu);
		extern int sched_isolate_cpu(int cpu);
		extern int sched_unisolate_cpu(int cpu);
		extern int sched_unisolate_cpu_unlocked(int cpu);
		#else
		static inline int sched_isolate_cpu(int cpu)
		{
		@@ -541,13 +541,13 @@ struct cpu_cycle_counter_cb {
		DECLARE_PER_CPU_READ_MOSTLY(int, sched_load_boost);

		#ifdef CONFIG_SCHED_WALT
		extern void __weak sched_exit(struct task_struct *p);
		extern void sched_exit(struct task_struct *p);
		extern int __weak
		register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb);
		extern void __weak
		sched_update_cpu_freq_min_max(const cpumask_t *cpus, u32 fmin, u32 fmax);
		extern void __weak free_task_load_ptrs(struct task_struct *p);
		extern void __weak sched_set_refresh_rate(enum fps fps);
		extern void free_task_load_ptrs(struct task_struct *p);
		extern void sched_set_refresh_rate(enum fps fps);
		extern int set_task_boost(int boost, u64 period);

		#define RAVG_HIST_SIZE_MAX 5

include/linux/sched/core_ctl.h

+4 −4

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2016, 2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016, 2019-2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef __CORE_CTL_H
		@@ -21,9 +21,9 @@ struct core_ctl_notif_data {
		struct notifier_block;

		#ifdef CONFIG_SCHED_WALT
		extern int __weak core_ctl_set_boost(bool boost);
		extern void __weak core_ctl_notifier_register(struct notifier_block *n);
		extern void __weak core_ctl_notifier_unregister(struct notifier_block *n);
		extern int core_ctl_set_boost(bool boost);
		extern void core_ctl_notifier_register(struct notifier_block *n);
		extern void core_ctl_notifier_unregister(struct notifier_block *n);
		#else
		static inline int core_ctl_set_boost(bool boost)
		{

include/linux/sched/stat.h

+23 −8

Original line number	Diff line number	Diff line
		@@ -22,20 +22,35 @@ extern unsigned long nr_iowait(void);
		extern unsigned long nr_iowait_cpu(int cpu);

		#ifdef CONFIG_SCHED_WALT
		extern void __weak sched_update_nr_prod(int cpu, long delta, bool inc);
		extern unsigned int __weak sched_get_cpu_util(int cpu);
		extern void __weak sched_update_hyst_times(void);
		extern u64 __weak sched_lpm_disallowed_time(int cpu);
		extern void sched_update_nr_prod(int cpu, long delta, bool inc);
		extern unsigned int sched_get_cpu_util(int cpu);
		extern void sched_update_hyst_times(void);
		extern u64 sched_lpm_disallowed_time(int cpu);

		extern int sched_wake_up_idle_show(struct seq_file m, void v);
		extern ssize_t sched_wake_up_idle_write(struct file *file,
		const char __user buf, size_t count, loff_t offset);
		extern int sched_wake_up_idle_open(struct inode *inode,
		struct file *filp);

		extern int sched_init_task_load_show(struct seq_file m, void v);
		extern ssize_t
		sched_init_task_load_write(struct file file, const char __user buf,
		size_t count, loff_t *offset);
		extern int
		sched_init_task_load_open(struct inode inode, struct file filp);

		extern int sched_group_id_show(struct seq_file m, void v);
		extern ssize_t
		sched_group_id_write(struct file file, const char __user buf,
		size_t count, loff_t *offset);
		extern int sched_group_id_open(struct inode inode, struct file filp);
		#else
		static inline void sched_update_nr_prod(int cpu, long delta, bool inc) {}
		static inline unsigned int sched_get_cpu_util(int cpu)
		{
		return 0;
		}
		static inline u64 sched_get_cpu_last_busy_time(int cpu)
		{
		return 0;
		}
		static inline void sched_update_hyst_times(void) {}
		static inline u64 sched_lpm_disallowed_time(int cpu)
		{

include/linux/sched/sysctl.h

+7 −8

Original line number	Diff line number	Diff line
		@@ -54,24 +54,27 @@ extern unsigned int __weak sysctl_sched_ravg_window_nr_ticks;
		extern unsigned int __weak sysctl_sched_many_wakeup_threshold;
		extern unsigned int __weak sysctl_sched_dynamic_ravg_window_enable;

		extern int __weak
		extern int
		walt_proc_group_thresholds_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos);
		extern int __weak
		extern int
		walt_proc_user_hint_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos);

		extern int __weak
		extern int
		sched_updown_migrate_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos);

		extern int __weak
		extern int
		sched_ravg_window_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos);

		extern int sched_boost_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos);
		#endif

		#if defined(CONFIG_PREEMPTIRQ_EVENTS) \|\| defined(CONFIG_PREEMPT_TRACER)
		@@ -103,10 +106,6 @@ int sched_proc_update_handler(struct ctl_table *table, int write,
		loff_t *ppos);
		#endif

		#ifdef CONFIG_SCHED_WALT
		extern int __weak sched_boost_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos);
		#endif
		/*
		* control realtime throttling:
		*