Index: sys/amd64/include/runq.h
===================================================================
--- sys/amd64/include/runq.h
+++ sys/amd64/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(1)		/* Number of priority status words. */
+#define	RQB_LEN		(4)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/arm/include/runq.h
===================================================================
--- sys/arm/include/runq.h
+++ sys/arm/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(2)		/* Number of priority status words. */
+#define	RQB_LEN		(8)		/* Number of priority status words. */
 #define	RQB_L2BPW	(5)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/arm64/include/runq.h
===================================================================
--- sys/arm64/include/runq.h
+++ sys/arm64/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(1)		/* Number of priority status words. */
+#define	RQB_LEN		(4)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/i386/include/runq.h
===================================================================
--- sys/i386/include/runq.h
+++ sys/i386/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(2)		/* Number of priority status words. */
+#define	RQB_LEN		(8)		/* Number of priority status words. */
 #define	RQB_L2BPW	(5)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/mips/include/runq.h
===================================================================
--- sys/mips/include/runq.h
+++ sys/mips/include/runq.h
@@ -31,10 +31,10 @@
 #define	_MACHINE_RUNQ_H_
 
 #ifdef __mips_n64
-#define	RQB_LEN		(1)		/* Number of priority status words. */
+#define	RQB_LEN		(4)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #else
-#define	RQB_LEN		(2)		/* Number of priority status words. */
+#define	RQB_LEN		(8)		/* 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. */
Index: sys/powerpc/include/runq.h
===================================================================
--- sys/powerpc/include/runq.h
+++ sys/powerpc/include/runq.h
@@ -30,10 +30,10 @@
 #define	_MACHINE_RUNQ_H_
 
 #ifdef __powerpc64__
-#define	RQB_LEN		(1UL)		/* Number of priority status words. */
+#define	RQB_LEN		(4UL)		/* 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_LEN		(8)		/* Number of priority status words. */
 #define	RQB_L2BPW	(5)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #endif
 #define	RQB_BPW		(1UL<<RQB_L2BPW) /* Bits in an rqb_word_t. */
Index: sys/riscv/include/runq.h
===================================================================
--- sys/riscv/include/runq.h
+++ sys/riscv/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(1)		/* Number of priority status words. */
+#define	RQB_LEN		(4)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/sparc64/include/runq.h
===================================================================
--- sys/sparc64/include/runq.h
+++ sys/sparc64/include/runq.h
@@ -29,7 +29,7 @@
 #ifndef	_MACHINE_RUNQ_H_
 #define	_MACHINE_RUNQ_H_
 
-#define	RQB_LEN		(1UL)		/* Number of priority status words. */
+#define	RQB_LEN		(4UL)		/* Number of priority status words. */
 #define	RQB_L2BPW	(6UL)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
 #define	RQB_BPW		(1UL<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
 
Index: sys/sys/runq.h
===================================================================
--- sys/sys/runq.h
+++ sys/sys/runq.h
@@ -37,8 +37,8 @@
  * Run queue parameters.
  */
 
-#define	RQ_NQS		(64)		/* Number of run queues. */
-#define	RQ_PPQ		(4)		/* Priorities per queue. */
+#define	RQ_NQS		(256)		/* Number of run queues. */
+#define	RQ_PPQ		(1)		/* Priorities per queue. */
 
 /*
  * Head of run queues.