diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 15:01:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 15:01:00 -0500 |
| commit | 39cd72de49032f1d9cd9166241ff4854a2cbb56b (patch) | |
| tree | 095732775fa4e2a47683ebd034df4d358d460f9e | |
| parent | 2c5d63d8f013f232fc6e353d9151b35ec7282d52 (diff) | |
| parent | 90b2628f1fe94a667330d425a7fb76ec8d2a49ec (diff) | |
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
| -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 @@ | |||
| 31 | /* | 31 | /* |
| 32 | * Ease the printing of nsec fields: | 32 | * Ease the printing of nsec fields: |
| 33 | */ | 33 | */ |
| 34 | static long long nsec_high(long long nsec) | 34 | static 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) | |||
| 43 | return nsec; | 43 | return nsec; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static unsigned long nsec_low(long long nsec) | 46 | static 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); |