svn commit: r199342 - projects/ppc64/sys/powerpc/include

[Nathan Whitehorn]

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.