Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched (39cd72de) · Commits · 戴 / test

kernel/sched_debug.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,9 @@
	/*		/*
	* Ease the printing of nsec fields:		* 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;		nsec = -nsec;
	do_div(nsec, 1000000);		do_div(nsec, 1000000);
	return -nsec;		return -nsec;
	@@ -43,9 +43,9 @@ static long long nsec_high(long long nsec)
	return 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;		nsec = -nsec;

	return do_div(nsec, 1000000);		return do_div(nsec, 1000000);