Merge "sched/fair: Fix compilation error when !SMP" (4cc2c36e) · Commits · e / devices / android_kernel_xiaomi_markw

kernel/sched/fair.c

+4 −10

Original line number	Original line	Diff line number	Diff line
	@@ -4166,8 +4166,6 @@ void init_new_task_load(struct task_struct *p)

	#else /* CONFIG_SCHED_HMP */		#else /* CONFIG_SCHED_HMP */

	#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)

	void init_new_task_load(struct task_struct *p)		void init_new_task_load(struct task_struct *p)
	{		{
	p->se.avg.decay_count = 0;		p->se.avg.decay_count = 0;
	@@ -4175,14 +4173,6 @@ void init_new_task_load(struct task_struct *p)
	p->se.avg.runnable_avg_sum = 0;		p->se.avg.runnable_avg_sum = 0;
	}		}

	#else /* CONFIG_SMP && CONFIG_FAIR_GROUP_SCHED */

	void init_new_task_load(struct task_struct *p)
	{
	}

	#endif /* CONFIG_SMP && CONFIG_FAIR_GROUP_SCHED */

	#endif /* CONFIG_SCHED_HMP */		#endif /* CONFIG_SCHED_HMP */

	/*		/*
	@@ -4621,6 +4611,10 @@ inc_rq_hmp_stats(struct rq rq, struct task_struct p, int change_cra) { }
	static inline void		static inline void
	dec_rq_hmp_stats(struct rq rq, struct task_struct p, int change_cra) { }		dec_rq_hmp_stats(struct rq rq, struct task_struct p, int change_cra) { }

			void init_new_task_load(struct task_struct *p)
			{
			}

	#endif /* CONFIG_SMP */		#endif /* CONFIG_SMP */

	#ifdef CONFIG_SCHED_HMP		#ifdef CONFIG_SCHED_HMP