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

Commit e91dade5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fixes from Ingo Molnar:
 "Three small fixlets"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz: fix compile warning in tick_nohz_init()
  nohz: Do not warn about unstable tsc unless user uses nohz_full
  sched_clock: Fix integer overflow
parents fbf21849 ae920eb2

kernel/time/sched_clock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) 
	BUG_ON(bits > 32);

	BUG_ON(bits > 32);

	WARN_ON(!irqs_disabled());

	WARN_ON(!irqs_disabled());

	read_sched_clock = read;

	read_sched_clock = read;

	sched_clock_mask = (1 << bits) - 1;

	sched_clock_mask = (1ULL << bits) - 1;

	cd.rate = rate;

	cd.rate = rate;





	/* calculate the mult/shift to convert counter ticks to ns. */

	/* calculate the mult/shift to convert counter ticks to ns. */

kernel/time/tick-sched.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -182,7 +182,8 @@ static bool can_stop_full_tick(void) 
		 * Don't allow the user to think they can get

		 * Don't allow the user to think they can get

		 * full NO_HZ with this machine.

		 * full NO_HZ with this machine.

		 */

		 */

		WARN_ONCE(1, "NO_HZ FULL will not work with unstable sched clock");

		WARN_ONCE(have_nohz_full_mask,

			  "NO_HZ FULL will not work with unstable sched clock");

		return false;

		return false;

	}

	}

#endif

#endif
@@ -343,8 +344,6 @@ static int tick_nohz_init_all(void) 




void __init tick_nohz_init(void)

void __init tick_nohz_init(void)

{

{

	int cpu;



	if (!have_nohz_full_mask) {

	if (!have_nohz_full_mask) {

		if (tick_nohz_init_all() < 0)

		if (tick_nohz_init_all() < 0)

			return;

			return;