Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-s…
Browse files Browse the repository at this point in the history
…ched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: fix gcc warnings
  • Loading branch information
Linus Torvalds committed Jan 3, 2008
2 parents 2c5d63d + 90b2628 commit 39cd72d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions kernel/sched_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 39cd72d

Please sign in to comment.