From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 17 03:37:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFCD81065693;
	Tue, 17 Nov 2009 03:37:24 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E1708FC1D;
	Tue, 17 Nov 2009 03:37:24 +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 nAH3bO3V090263;
	Tue, 17 Nov 2009 03:37:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAH3bOeh090261;
	Tue, 17 Nov 2009 03:37:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200911170337.nAH3bOeh090261@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 17 Nov 2009 03:37:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199342 - projects/ppc64/sys/powerpc/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2009 03:37:24 -0000

Author: nwhitehorn
Date: Tue Nov 17 03:37:24 2009
New Revision: 199342
URL: http://svn.freebsd.org/changeset/base/199342

Log:
  Fix runq on 64-bit. Signal delivery is still broken, but init now comes
  up enough to complain about it on my iMac, and sysinstall lets me start
  to partition a disk in Mambo.

Modified:
  projects/ppc64/sys/powerpc/include/runq.h

Modified: projects/ppc64/sys/powerpc/include/runq.h
==============================================================================
--- projects/ppc64/sys/powerpc/include/runq.h	Tue Nov 17 03:27:58 2009	(r199341)
+++ projects/ppc64/sys/powerpc/include/runq.h	Tue Nov 17 03:37:24 2009	(r199342)
@@ -30,18 +30,18 @@
 #define	_MACHINE_RUNQ_H_
 
 #ifdef __powerpc64__
-#define	RQB_LEN		(1)		/* Number of priority status words. */
-#define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
+#define	RQB_LEN		(1UL)		/* Number of priority status words. */
+#define	RQB_L2BPW	(6UL)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #else
 #define	RQB_LEN		(2)		/* Number of priority status words. */
 #define	RQB_L2BPW	(5)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #endif
-#define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
+#define	RQB_BPW		(1UL<<RQB_L2BPW) /* Bits in an rqb_word_t. */
 
-#define	RQB_BIT(pri)	(1 << ((pri) & (RQB_BPW - 1)))
+#define	RQB_BIT(pri)	(1UL << ((pri) & (RQB_BPW - 1)))
 #define	RQB_WORD(pri)	((pri) >> RQB_L2BPW)
 
-#define	RQB_FFS(word)	(ffs(word) - 1)
+#define	RQB_FFS(word)	(ffsl(word) - 1)
 
 /*
  * Type of run queue status word.