Commit 238628ed authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] sched: fix signed comparisons of long long 



Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a9947bf

kernel/sched.c

+3 −3
Original line number Diff line number Diff line
@@ -2648,9 +2648,9 @@ asmlinkage void __sched schedule(void) 


	schedstat_inc(rq, sched_cnt);

	now = sched_clock();

	if (likely((long long)now - prev->timestamp < NS_MAX_SLEEP_AVG)) {

	if (likely((long long)(now - prev->timestamp) < NS_MAX_SLEEP_AVG)) {

		run_time = now - prev->timestamp;

		if (unlikely((long long)now - prev->timestamp < 0))

		if (unlikely((long long)(now - prev->timestamp) < 0))

			run_time = 0;

	} else

		run_time = NS_MAX_SLEEP_AVG;
@@ -2728,7 +2728,7 @@ asmlinkage void __sched schedule(void) 


	if (!rt_task(next) && next->activated > 0) {

		unsigned long long delta = now - next->timestamp;

		if (unlikely((long long)now - next->timestamp < 0))

		if (unlikely((long long)(now - next->timestamp) < 0))

			delta = 0;



		if (next->activated == 1)