From owner-svn-src-head@FreeBSD.ORG  Thu Jul 29 13:52:46 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2D081065677;
	Thu, 29 Jul 2010 13:52:46 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D24238FC08;
	Thu, 29 Jul 2010 13:52:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6TDqkFY058136;
	Thu, 29 Jul 2010 13:52:46 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6TDqkwQ058134;
	Thu, 29 Jul 2010 13:52:46 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201007291352.o6TDqkwQ058134@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Thu, 29 Jul 2010 13:52:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210605 - head/sys/mips/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2010 13:52:47 -0000

Author: jchandra
Date: Thu Jul 29 13:52:46 2010
New Revision: 210605
URL: http://svn.freebsd.org/changeset/base/210605

Log:
  Fix RQB_FFS for 64 bit, we need to use ffsl() for 64bit.
  
  Use 'ifdef __mips_n64' instead of 'if defined' to be consistant with other
  usage.

Modified:
  head/sys/mips/include/runq.h

Modified: head/sys/mips/include/runq.h
==============================================================================
--- head/sys/mips/include/runq.h	Thu Jul 29 13:46:37 2010	(r210604)
+++ head/sys/mips/include/runq.h	Thu Jul 29 13:52:46 2010	(r210605)
@@ -30,7 +30,7 @@
 #ifndef _MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#if defined(__mips_n64)
+#ifdef __mips_n64
 #define	RQB_LEN		(1)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #else
@@ -42,12 +42,16 @@
 #define	RQB_BIT(pri)	(1ul << ((pri) & (RQB_BPW - 1)))
 #define	RQB_WORD(pri)	((pri) >> RQB_L2BPW)
 
+#ifdef __mips_n64
+#define	RQB_FFS(word)	(ffsl(word) - 1)
+#else
 #define	RQB_FFS(word)	(ffs(word) - 1)
+#endif
 
 /*
  * Type of run queue status word.
  */
-#if defined(__mips_n64)
+#ifdef __mips_n64
 typedef	u_int64_t	rqb_word_t;
 #else
 typedef	u_int32_t	rqb_word_t;