From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sun, 24 Oct 2010 22:29:00 +0000 (-0700)
Subject: kernel - Temporarily back-out smp_invltlb() changes
X-Git-Tag: v2.8.1~5
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/5ebb38a6820970ecbc917a7b97c092f200f71b27

kernel - Temporarily back-out smp_invltlb() changes

* These changes are deadlocking i386 kernels, and it is too close to
  the release so back them out for the release.  The issue will be
  fixed another way post-release.
---

diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index 95e231c4cd..c3bdc1a2e1 100644
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -2606,13 +2606,14 @@ void
 smp_invltlb(void)
 {
 #ifdef SMP
+#if 0
 	pmap_inval_info info;
 
 	pmap_inval_init(&info);
 	pmap_inval_interlock(&info, &kernel_pmap, -1);
 	pmap_inval_deinterlock(&info, &kernel_pmap);
 	pmap_inval_done(&info);
-#if 0
+#else
 	if (smp_startup_mask == smp_active_mask) {
 		all_but_self_ipi(XINVLTLB_OFFSET);
 	} else {
diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c
index 221c5fca76..32cb86dc19 100644
--- a/sys/platform/pc64/x86_64/mp_machdep.c
+++ b/sys/platform/pc64/x86_64/mp_machdep.c
@@ -2789,13 +2789,14 @@ void
 smp_invltlb(void)
 {
 #ifdef SMP
+#if 0
 	struct pmap_inval_info info;
 
 	pmap_inval_init(&info);
 	pmap_inval_interlock(&info, &kernel_pmap, -1);
 	pmap_inval_deinterlock(&info, &kernel_pmap);
 	pmap_inval_done(&info);
-#if 0
+#else
 	if (smp_startup_mask == smp_active_mask) {
 		all_but_self_ipi(XINVLTLB_OFFSET);
 	} else {