7 files changed, 21 insertions, 21 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 5920f4313fa5..eceaa81b8041 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -2475,7 +2475,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 	/* XXX */
 	if (p->p_ithd)
 		cpustate = CHECKSTATE_INTR;
-	else if (p == idleproc)
+	else if (p == SMP_prvspace[id].globaldata.gd_idleproc)
 		cpustate = CHECKSTATE_SYS;
 
 	switch (cpustate) {
@@ -2507,7 +2507,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 		if (pscnt > 1)
 			return;
 
-		if (p == idleproc) {
+		if (p == SMP_prvspace[id].globaldata.gd_idleproc) {
 			p->p_sticks++;
 			cp_time[CP_IDLE]++;
 		} else {
@@ -2536,7 +2536,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			p->p_iticks++;
 		cp_time[CP_INTR]++;
 	}
-	if (p != idleproc) {
+	if (p != SMP_prvspace[id].globaldata.gd_idleproc) {
 		schedclock(p);
 		
 		/* Update resource usage integrals and maximums. */