From 8c636a11dc3c59260077c11bf06b03a1fe321d23 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Mon, 11 Jul 2016 21:25:28 +0000 Subject: [PATCH] Remove assumptions in MI code that the BSP is CPU 0. MFC after: 2 weeks --- sys/kern/init_main.c | 2 +- sys/net/netisr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 85382cdd8c5..915c84d55f9 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -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(); diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 318e1a3f6e0..24ac96c0971 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -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 */