- Modify pmap_activate so it only marks the pmap as active.

- Add a pmap_deactivate function.

4 files changed, 37 insertions, 0 deletions

diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 741faf4..20f9bae 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -750,7 +750,9 @@ pmap_activate(struct thread *td)
 
 	/*
 	 * XXX: Address this again later?
+	 * NetBSD only change the segment registers on return to userland.
 	 */
+#if 0
 	critical_enter();
 
 	for (i = 0; i < 16; i++) {
@@ -759,6 +761,16 @@ pmap_activate(struct thread *td)
 	__asm __volatile("sync; isync");
 
 	critical_exit();
+#endif
+}
+
+void
+pmap_deactivate(struct thread *td)
+{
+	pmap_t	pm;
+
+	pm = &td->td_proc->p_vmspace->vm_pmap;
+	pm->pm_active &= ~(PCPU_GET(cpumask));
 }
 
 vm_offset_t
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index 080c5a3..841e55a 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -69,6 +69,7 @@ extern	struct pmap kernel_pmap_store;
 #ifdef _KERNEL
 
 void		pmap_bootstrap(vm_offset_t, vm_offset_t);
+void		pmap_deactivate(struct thread *);
 vm_offset_t	pmap_kextract(vm_offset_t);
 
 int		pmap_pte_spill(vm_offset_t);
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index 741faf4..20f9bae 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -750,7 +750,9 @@ pmap_activate(struct thread *td)
 
 	/*
 	 * XXX: Address this again later?
+	 * NetBSD only change the segment registers on return to userland.
 	 */
+#if 0
 	critical_enter();
 
 	for (i = 0; i < 16; i++) {
@@ -759,6 +761,16 @@ pmap_activate(struct thread *td)
 	__asm __volatile("sync; isync");
 
 	critical_exit();
+#endif
+}
+
+void
+pmap_deactivate(struct thread *td)
+{
+	pmap_t	pm;
+
+	pm = &td->td_proc->p_vmspace->vm_pmap;
+	pm->pm_active &= ~(PCPU_GET(cpumask));
 }
 
 vm_offset_t
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 741faf4..20f9bae 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -750,7 +750,9 @@ pmap_activate(struct thread *td)
 
 	/*
 	 * XXX: Address this again later?
+	 * NetBSD only change the segment registers on return to userland.
 	 */
+#if 0
 	critical_enter();
 
 	for (i = 0; i < 16; i++) {
@@ -759,6 +761,16 @@ pmap_activate(struct thread *td)
 	__asm __volatile("sync; isync");
 
 	critical_exit();
+#endif
+}
+
+void
+pmap_deactivate(struct thread *td)
+{
+	pmap_t	pm;
+
+	pm = &td->td_proc->p_vmspace->vm_pmap;
+	pm->pm_active &= ~(PCPU_GET(cpumask));
 }
 
 vm_offset_t