Date: Fri, 24 Apr 2015 07:52:21 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r281921 - stable/10/sys/kern Message-ID: <201504240752.t3O7qLLi021760@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Fri Apr 24 07:52:21 2015 New Revision: 281921 URL: https://svnweb.freebsd.org/changeset/base/281921 Log: MFC r280786: Try to unbreak !SMP kernels broken in r280785 (head), r281657 by using the proper macros to access cc_cpu. Requested by: jmallett Pointyhat to: rrs Modified: stable/10/sys/kern/kern_timeout.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_timeout.c ============================================================================== --- stable/10/sys/kern/kern_timeout.c Fri Apr 24 07:24:31 2015 (r281920) +++ stable/10/sys/kern/kern_timeout.c Fri Apr 24 07:52:21 2015 (r281921) @@ -256,7 +256,7 @@ callout_callwheel_init(void *dummy) * XXX: Clip callout to result of previous function of maxusers * maximum 384. This is still huge, but acceptable. */ - memset(cc_cpu, 0, sizeof(cc_cpu)); + memset(CC_CPU(0), 0, sizeof(cc_cpu)); ncallout = imin(16 + maxproc + maxfiles, 18508); TUNABLE_INT_FETCH("kern.ncallout", &ncallout); @@ -927,7 +927,7 @@ callout_reset_sbt_on(struct callout *c, if (cpu == -1) { ignore_cpu = 1; } else if ((cpu >= MAXCPU) || - (cc_cpu[cpu].cc_inited == 0)) { + ((CC_CPU(cpu))->cc_inited == 0)) { /* Invalid CPU spec */ panic("Invalid CPU in callout %d", cpu); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504240752.t3O7qLLi021760>