Fix warning spit out.
Reported by: sbruno
This commit is contained in:
parent
768d7c2d1e
commit
cc0337466b
@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <sys/msgbuf.h>
|
#include <sys/msgbuf.h>
|
||||||
#include <sys/lock.h>
|
#include <sys/lock.h>
|
||||||
#include <sys/mutex.h>
|
#include <sys/mutex.h>
|
||||||
|
#include <sys/sched.h>
|
||||||
#include <sys/smp.h>
|
#include <sys/smp.h>
|
||||||
#include <sys/vmmeter.h>
|
#include <sys/vmmeter.h>
|
||||||
|
|
||||||
@ -1228,7 +1229,7 @@ mmu_booke_bootstrap(mmu_t mmu, vm_offset_t start, vm_offset_t kernelend)
|
|||||||
PTE_VALID;
|
PTE_VALID;
|
||||||
}
|
}
|
||||||
/* Mark kernel_pmap active on all CPUs */
|
/* Mark kernel_pmap active on all CPUs */
|
||||||
kernel_pmap->pm_active = ~0;
|
CPU_FILL(&kernel_pmap->pm_active);
|
||||||
|
|
||||||
/*******************************************************/
|
/*******************************************************/
|
||||||
/* Final setup */
|
/* Final setup */
|
||||||
@ -1483,7 +1484,7 @@ mmu_booke_pinit(mmu_t mmu, pmap_t pmap)
|
|||||||
PMAP_LOCK_INIT(pmap);
|
PMAP_LOCK_INIT(pmap);
|
||||||
for (i = 0; i < MAXCPU; i++)
|
for (i = 0; i < MAXCPU; i++)
|
||||||
pmap->pm_tid[i] = TID_NONE;
|
pmap->pm_tid[i] = TID_NONE;
|
||||||
pmap->pm_active = 0;
|
CPU_ZERO(&kernel_pmap->pm_active);
|
||||||
bzero(&pmap->pm_stats, sizeof(pmap->pm_stats));
|
bzero(&pmap->pm_stats, sizeof(pmap->pm_stats));
|
||||||
bzero(&pmap->pm_pdir, sizeof(pte_t *) * PDIR_NENTRIES);
|
bzero(&pmap->pm_pdir, sizeof(pte_t *) * PDIR_NENTRIES);
|
||||||
TAILQ_INIT(&pmap->pm_ptbl_list);
|
TAILQ_INIT(&pmap->pm_ptbl_list);
|
||||||
@ -1838,7 +1839,7 @@ mmu_booke_activate(mmu_t mmu, struct thread *td)
|
|||||||
|
|
||||||
mtx_lock_spin(&sched_lock);
|
mtx_lock_spin(&sched_lock);
|
||||||
|
|
||||||
atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask));
|
CPU_OR_ATOMIC(&pmap->pm_active, PCPU_PTR(cpumask));
|
||||||
PCPU_SET(curpmap, pmap);
|
PCPU_SET(curpmap, pmap);
|
||||||
|
|
||||||
if (pmap->pm_tid[PCPU_GET(cpuid)] == TID_NONE)
|
if (pmap->pm_tid[PCPU_GET(cpuid)] == TID_NONE)
|
||||||
@ -1867,7 +1868,9 @@ mmu_booke_deactivate(mmu_t mmu, struct thread *td)
|
|||||||
CTR5(KTR_PMAP, "%s: td=%p, proc = '%s', id = %d, pmap = 0x%08x",
|
CTR5(KTR_PMAP, "%s: td=%p, proc = '%s', id = %d, pmap = 0x%08x",
|
||||||
__func__, td, td->td_proc->p_comm, td->td_proc->p_pid, pmap);
|
__func__, td, td->td_proc->p_comm, td->td_proc->p_pid, pmap);
|
||||||
|
|
||||||
atomic_clear_int(&pmap->pm_active, PCPU_GET(cpumask));
|
sched_pin();
|
||||||
|
CPU_NAND_ATOMIC(&pmap->pm_active, PCPU_PTR(cpumask));
|
||||||
|
sched_unpin();
|
||||||
PCPU_SET(curpmap, NULL);
|
PCPU_SET(curpmap, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user