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

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