From ad62ba6e96f00cff4b6da027168e1b7561549def Mon Sep 17 00:00:00 2001 From: "Jason A. Harmening" Date: Sat, 4 Feb 2017 06:24:49 +0000 Subject: Revert r313037 The switch to get_pcpu() in MI code seems to cause hangs on MIPS. Back out until we can get a better idea of what's happening there. Reported by: kan, lidl --- sys/net/netisr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/net/netisr.c') diff --git a/sys/net/netisr.c b/sys/net/netisr.c index b96ff1c070a7..755c288d2269 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -1268,7 +1268,9 @@ netisr_start_swi(u_int cpuid, struct pcpu *pc) static void netisr_init(void *arg) { +#ifdef EARLY_AP_STARTUP struct pcpu *pc; +#endif NETISR_LOCK_INIT(); if (netisr_maxthreads == 0 || netisr_maxthreads < -1 ) @@ -1306,8 +1308,7 @@ netisr_init(void *arg) netisr_start_swi(pc->pc_cpuid, pc); } #else - pc = get_pcpu(); - netisr_start_swi(pc->pc_cpuid, pc); + netisr_start_swi(curcpu, pcpu_find(curcpu)); #endif } SYSINIT(netisr_init, SI_SUB_SOFTINTR, SI_ORDER_FIRST, netisr_init, NULL); -- cgit v1.2.3