History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix gcc warnings

Linus Torvalds committed 18 years ago

Commit 39cd72d2 parents 2c5d63d 90b26281 file · +4 −4Browse files

Unified · Split

kernel/sched_debug.c+4−4
@@ -31,9 +31,9 @@ · 30 unmodified lines
31/*31/*
32 * Ease the printing of nsec fields:32 * Ease the printing of nsec fields:
33 */33 */
34static long long nsec_high(long long nsec)34static long long nsec_high(unsigned long long nsec)
35{35{
36 if (nsec < 0) {36 if ((long long)nsec < 0) {
37 nsec = -nsec;37 nsec = -nsec;
38 do_div(nsec, 1000000);38 do_div(nsec, 1000000);
39 return -nsec;39 return -nsec;
@@ -43,9 +43,9 @@ static long long nsec_high(long long nsec) · 3 unmodified lines
43 return nsec;43 return nsec;
44}44}
45 45
46static unsigned long nsec_low(long long nsec)46static unsigned long nsec_low(unsigned long long nsec)
47{47{
48 if (nsec < 0)48 if ((long long)nsec < 0)
49 nsec = -nsec;49 nsec = -nsec;
50 50
51 return do_div(nsec, 1000000);51 return do_div(nsec, 1000000);