Merge "sched/rt: Remove #ifdefery around SCHED_CORE_ROTATE" (fd32b3a6) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/sched/rt.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -1758,13 +1758,8 @@ static int find_lowest_rq(struct task_struct *task)
		int best_cpu_idle_idx = INT_MAX;
		int cpu_idle_idx = -1;
		bool placement_boost;
		#ifdef CONFIG_SCHED_CORE_ROTATE
		bool do_rotate = false;
		bool avoid_prev_cpu = false;
		#else
		#define do_rotate false
		#define avoid_prev_cpu false
		#endif

		/* Make sure the mask is initialized first */
		if (unlikely(!lowest_mask))
		@@ -1892,7 +1887,6 @@ static int find_lowest_rq(struct task_struct *task)
		best_cpu = cpu;
		}

		#ifdef CONFIG_SCHED_CORE_ROTATE
		if (do_rotate) {
		/*
		* We started iteration somewhere in the middle of
		@@ -1903,7 +1897,6 @@ static int find_lowest_rq(struct task_struct *task)
		cpu = -1;
		goto retry;
		}
		#endif

		if (best_cpu != -1) {
		return best_cpu;