diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2015-03-28 15:07:19 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2015-03-28 15:07:19 +0000 |
| commit | a04d41229568ab10e28338bd1a6188658dfed61b (patch) | |
| tree | bc018d83bf54ced3d83647d6ce31dc36f4b4f2f0 /sys/kern/kern_timeout.c | |
| parent | 15b1eb142c4c215f5e80926f070650bee57b3e59 (diff) | |
| download | src-a04d41229568ab10e28338bd1a6188658dfed61b.tar.gz src-a04d41229568ab10e28338bd1a6188658dfed61b.zip | |
Try to unbreak !SMP kernels broken in r280785 by using the proper macros
to access cc_cpu.
Notes
Notes:
svn path=/head/; revision=280786
Diffstat (limited to 'sys/kern/kern_timeout.c')
| -rw-r--r-- | sys/kern/kern_timeout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 29c41287e08a..c6cb18e2d38a 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -267,7 +267,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); @@ -954,7 +954,7 @@ callout_reset_sbt_on(struct callout *c, sbintime_t sbt, sbintime_t precision, 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); } |