svn commit: r302595 - in head/sys: kern net

Nathan Whitehorn nwhitehorn at FreeBSD.org
Mon Jul 11 21:25:29 UTC 2016


Author: nwhitehorn
Date: Mon Jul 11 21:25:28 2016
New Revision: 302595
URL: https://svnweb.freebsd.org/changeset/base/302595

Log:
  Remove assumptions in MI code that the BSP is CPU 0.
  
  MFC after:	2 weeks

Modified:
  head/sys/kern/init_main.c
  head/sys/net/netisr.c

Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c	Mon Jul 11 21:23:50 2016	(r302594)
+++ head/sys/kern/init_main.c	Mon Jul 11 21:25:28 2016	(r302595)
@@ -495,7 +495,7 @@ proc0_init(void *dummy __unused)
 	td->td_lend_user_pri = PRI_MAX;
 	td->td_priority = PVM;
 	td->td_base_pri = PVM;
-	td->td_oncpu = 0;
+	td->td_oncpu = curcpu;
 	td->td_flags = TDF_INMEM;
 	td->td_pflags = TDP_KTHREAD;
 	td->td_cpuset = cpuset_thread0();

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Mon Jul 11 21:23:50 2016	(r302594)
+++ head/sys/net/netisr.c	Mon Jul 11 21:25:28 2016	(r302595)
@@ -1273,8 +1273,6 @@ netisr_init(void *arg)
 	struct pcpu *pc;
 #endif
 
-	KASSERT(curcpu == 0, ("%s: not on CPU 0", __func__));
-
 	NETISR_LOCK_INIT();
 	if (netisr_maxthreads == 0 || netisr_maxthreads < -1 )
 		netisr_maxthreads = 1;		/* default behavior */


More information about the svn-src-all mailing list