summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/mp_machdep.c18
-rw-r--r--sys/amd64/amd64/mptable.c18
-rw-r--r--sys/amd64/include/mptable.h18
-rw-r--r--sys/i386/i386/mp_machdep.c18
-rw-r--r--sys/i386/i386/mptable.c18
-rw-r--r--sys/i386/include/mptable.h18
-rw-r--r--sys/kern/subr_smp.c18
7 files changed, 77 insertions, 49 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index d532bec..d059fa0 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index d532bec..d059fa0 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d532bec..d059fa0 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index d532bec..d059fa0 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d532bec..d059fa0 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d532bec..d059fa0 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index d532bec..d059fa0 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.65 1998/02/09 06:08:13 eivind Exp $
+ * $Id: mp_machdep.c,v 1.66 1998/03/01 04:18:50 dyson Exp $
*/
#include "opt_smp.h"
@@ -2280,12 +2280,14 @@ forward_statclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_statclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
@@ -2369,12 +2371,14 @@ forward_hardclock(int pscnt)
checkstate_need_ast |= map;
selected_apic_ipi(map, XCPUAST_OFFSET, APIC_DELMODE_FIXED);
i = 0;
- while (checkstate_need_ast != 0) {
+ while ((checkstate_need_ast & map) != 0) {
/* spin */
i++;
- if (i > 1000000) {
+ if (i > 100000) {
+#ifdef BETTER_CLOCK_DIAGNOSTIC
printf("forward_hardclock: dropped ast 0x%x\n",
- checkstate_need_ast);
+ checkstate_need_ast & map);
+#endif
break;
}
}
OpenPOWER on IntegriCloud