diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 12:01:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 12:01:00 -0800 |
| commit | 39cd72de49032f1d9cd9166241ff4854a2cbb56b (patch) | |
| tree | 095732775fa4e2a47683ebd034df4d358d460f9e /kernel | |
| parent | 2c5d63d8f013f232fc6e353d9151b35ec7282d52 (diff) | |
| parent | 90b2628f1fe94a667330d425a7fb76ec8d2a49ec (diff) | |
| download | linux-39cd72de49032f1d9cd9166241ff4854a2cbb56b.tar.gz linux-39cd72de49032f1d9cd9166241ff4854a2cbb56b.tar.bz2 linux-39cd72de49032f1d9cd9166241ff4854a2cbb56b.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched_debug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index d30467b47ddd..80fbbfc04290 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -31,9 +31,9 @@ /* * Ease the printing of nsec fields: */ -static long long nsec_high(long long nsec) +static long long nsec_high(unsigned long long nsec) { - if (nsec < 0) { + if ((long long)nsec < 0) { nsec = -nsec; do_div(nsec, 1000000); return -nsec; @@ -43,9 +43,9 @@ static long long nsec_high(long long nsec) return nsec; } -static unsigned long nsec_low(long long nsec) +static unsigned long nsec_low(unsigned long long nsec) { - if (nsec < 0) + if ((long long)nsec < 0) nsec = -nsec; return do_div(nsec, 1000000); |