summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/kern_mutex.c6
-rw-r--r--sys/kern/subr_turnstile.c6
-rw-r--r--sys/kern/subr_witness.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 6d7b103ddf94..cbc0deac446a 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -212,7 +212,7 @@ propagate_priority(struct proc *p)
/*
* If lock holder is actually running, just bump priority.
*/
- if (p->p_oncpu != 0xff) {
+ if (p->p_oncpu != NOCPU) {
MPASS(p->p_stat == SRUN || p->p_stat == SZOMB);
return;
}
@@ -932,6 +932,8 @@ static char *spin_order_list[] = {
#ifdef __i386__
"cy",
#endif
+ "ithread table lock",
+ "ithread list lock",
"sched lock",
#ifdef __i386__
"clk",
@@ -940,8 +942,6 @@ static char *spin_order_list[] = {
/*
* leaf locks
*/
- "ithread table lock",
- "ithread list lock",
#ifdef SMP
#ifdef __i386__
"ap boot",
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 6d7b103ddf94..cbc0deac446a 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -212,7 +212,7 @@ propagate_priority(struct proc *p)
/*
* If lock holder is actually running, just bump priority.
*/
- if (p->p_oncpu != 0xff) {
+ if (p->p_oncpu != NOCPU) {
MPASS(p->p_stat == SRUN || p->p_stat == SZOMB);
return;
}
@@ -932,6 +932,8 @@ static char *spin_order_list[] = {
#ifdef __i386__
"cy",
#endif
+ "ithread table lock",
+ "ithread list lock",
"sched lock",
#ifdef __i386__
"clk",
@@ -940,8 +942,6 @@ static char *spin_order_list[] = {
/*
* leaf locks
*/
- "ithread table lock",
- "ithread list lock",
#ifdef SMP
#ifdef __i386__
"ap boot",
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 6d7b103ddf94..cbc0deac446a 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -212,7 +212,7 @@ propagate_priority(struct proc *p)
/*
* If lock holder is actually running, just bump priority.
*/
- if (p->p_oncpu != 0xff) {
+ if (p->p_oncpu != NOCPU) {
MPASS(p->p_stat == SRUN || p->p_stat == SZOMB);
return;
}
@@ -932,6 +932,8 @@ static char *spin_order_list[] = {
#ifdef __i386__
"cy",
#endif
+ "ithread table lock",
+ "ithread list lock",
"sched lock",
#ifdef __i386__
"clk",
@@ -940,8 +942,6 @@ static char *spin_order_list[] = {
/*
* leaf locks
*/
- "ithread table lock",
- "ithread list lock",
#ifdef SMP
#ifdef __i386__
"ap boot",