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
This commit is contained in:
Linus Torvalds 2008-01-03 12:01:00 -08:00
commit 39cd72de49

View File

@ -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);