diff options
| author | hrs <hrs@FreeBSD.org> | 2011-06-05 12:27:34 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-06-05 12:27:34 +0000 |
| commit | 8ff65f2104c6b6188f7a86fc8b074b5d9d8cf576 (patch) | |
| tree | be9323d9ac7dde0b1af11cdbcfae206542a1c222 /sys/kern/subr_pcpu.c | |
| parent | ecae8238dfcc956729cb43702018343ad85e6ba4 (diff) | |
| parent | 58bf7d3104c5e5f32bfd96ca36c8551c7d94fa53 (diff) | |
| download | FreeBSD-src-8ff65f2104c6b6188f7a86fc8b074b5d9d8cf576.zip FreeBSD-src-8ff65f2104c6b6188f7a86fc8b074b5d9d8cf576.tar.gz | |
Merge from HEAD@222712.
Diffstat (limited to 'sys/kern/subr_pcpu.c')
| -rw-r--r-- | sys/kern/subr_pcpu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c index de5cafc..5cb4f26 100644 --- a/sys/kern/subr_pcpu.c +++ b/sys/kern/subr_pcpu.c @@ -74,7 +74,7 @@ static TAILQ_HEAD(, dpcpu_free) dpcpu_head = TAILQ_HEAD_INITIALIZER(dpcpu_head); static struct sx dpcpu_lock; uintptr_t dpcpu_off[MAXCPU]; struct pcpu *cpuid_to_pcpu[MAXCPU]; -struct cpuhead cpuhead = SLIST_HEAD_INITIALIZER(cpuhead); +struct cpuhead cpuhead = STAILQ_HEAD_INITIALIZER(cpuhead); /* * Initialize the MI portions of a struct pcpu. @@ -89,7 +89,7 @@ pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) pcpu->pc_cpuid = cpuid; pcpu->pc_cpumask = 1 << cpuid; cpuid_to_pcpu[cpuid] = pcpu; - SLIST_INSERT_HEAD(&cpuhead, pcpu, pc_allcpu); + STAILQ_INSERT_TAIL(&cpuhead, pcpu, pc_allcpu); cpu_pcpu_init(pcpu, cpuid, size); pcpu->pc_rm_queue.rmq_next = &pcpu->pc_rm_queue; pcpu->pc_rm_queue.rmq_prev = &pcpu->pc_rm_queue; @@ -245,7 +245,7 @@ void pcpu_destroy(struct pcpu *pcpu) { - SLIST_REMOVE(&cpuhead, pcpu, pcpu, pc_allcpu); + STAILQ_REMOVE(&cpuhead, pcpu, pcpu, pc_allcpu); cpuid_to_pcpu[pcpu->pc_cpuid] = NULL; dpcpu_off[pcpu->pc_cpuid] = 0; } |
