Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609b07b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Ingo Molnar:
 "A fix for KVM's scheduler clock which (erroneously) was always marked
  unstable, a fix for RT/DL load balancing, plus latency fixes"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/clock, x86/tsc: Rework the x86 'unstable' sched_clock() interface
  sched/core: Fix pick_next_task() for RT,DL
  sched/fair: Make select_idle_cpu() more aggressive
parents c3abcabe f94c8d11

arch/x86/kernel/cpu/amd.c

+0 −4
Original line number Diff line number Diff line
@@ -556,10 +556,6 @@ static void early_init_amd(struct cpuinfo_x86 *c) 
	if (c->x86_power & (1 << 8)) {

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);

		if (check_tsc_unstable())

			clear_sched_clock_stable();

	} else {

		clear_sched_clock_stable();

	}



	/* Bit 12 of 8000_0007 edx is accumulated power mechanism. */

arch/x86/kernel/cpu/centaur.c

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ static void early_init_centaur(struct cpuinfo_x86 *c) 
#ifdef CONFIG_X86_64

	set_cpu_cap(c, X86_FEATURE_SYSENTER32);

#endif



	clear_sched_clock_stable();

}



static void init_centaur(struct cpuinfo_x86 *c)

arch/x86/kernel/cpu/common.c

+0 −3
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static void default_init(struct cpuinfo_x86 *c) 
			strcpy(c->x86_model_id, "386");

	}

#endif

	clear_sched_clock_stable();

}



static const struct cpu_dev default_cpu = {
@@ -1077,8 +1076,6 @@ static void identify_cpu(struct cpuinfo_x86 *c) 
	 */

	if (this_cpu->c_init)

		this_cpu->c_init(c);

	else

		clear_sched_clock_stable();



	/* Disable the PN if appropriate */

	squash_the_stupid_serial_number(c);

arch/x86/kernel/cpu/cyrix.c

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static void early_init_cyrix(struct cpuinfo_x86 *c) 
		set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);

		break;

	}

	clear_sched_clock_stable();

}



static void init_cyrix(struct cpuinfo_x86 *c)

arch/x86/kernel/cpu/intel.c

+0 −4
Original line number Diff line number Diff line
@@ -162,10 +162,6 @@ static void early_init_intel(struct cpuinfo_x86 *c) 
	if (c->x86_power & (1 << 8)) {

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);

		if (check_tsc_unstable())

			clear_sched_clock_stable();

	} else {

		clear_sched_clock_stable();

	}



	/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */