summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/cpu_switch.S22
-rw-r--r--sys/amd64/amd64/genassym.c5
-rw-r--r--sys/amd64/amd64/machdep.c1
-rw-r--r--sys/amd64/amd64/swtch.s22
-rw-r--r--sys/amd64/amd64/trap.c1
-rw-r--r--sys/amd64/amd64/vm_machdep.c2
-rw-r--r--sys/amd64/include/pcb.h1
7 files changed, 0 insertions, 54 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 93505aa..c780d6f 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -85,10 +85,6 @@ ENTRY(cpu_switch)
testl %ecx,%ecx
jz sw1
- movb P_ONCPU(%ecx), %al /* save "last" cpu */
- movb %al, P_LASTCPU(%ecx)
- movb $0xff, P_ONCPU(%ecx) /* "leave" the cpu */
-
movl P_VMSPACE(%ecx), %edx
movl PCPU(CPUID), %eax
btrl %eax, VM_PMAP+PM_ACTIVE(%edx)
@@ -124,10 +120,6 @@ ENTRY(cpu_switch)
movl %eax,PCB_DR0(%edx)
1:
- /* save sched_lock recursion count */
- movl _sched_lock+MTX_RECURSECNT,%eax
- movl %eax,PCB_SCHEDNEST(%edx)
-
#ifdef SMP
/* XXX FIXME: we should be saving the local APIC TPR */
#endif /* SMP */
@@ -242,9 +234,6 @@ sw1b:
#endif /** CHEAP_TPR */
#endif /** GRAB_LOPRIO */
#endif /* SMP */
- movl PCPU(CPUID),%eax
- movb %al, P_ONCPU(%ecx)
-
movl %edx, PCPU(CURPCB)
movl %ecx, PCPU(CURPROC) /* into next process */
@@ -289,17 +278,6 @@ cpu_switch_load_gs:
movl PCB_DR7(%edx),%eax
movl %eax,%dr7
1:
-
- /*
- * restore sched_lock recursion count and transfer ownership to
- * new process
- */
- movl PCB_SCHEDNEST(%edx),%eax
- movl %eax,_sched_lock+MTX_RECURSECNT
-
- movl PCPU(CURPROC),%eax
- movl %eax,_sched_lock+MTX_LOCK
-
ret
CROSSJUMPTARGET(sw1a)
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 0208cd3..fa6124c 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -88,9 +88,6 @@ ASSYM(P_WCHAN, offsetof(struct proc, p_wchan));
ASSYM(PS_ASTPENDING, PS_ASTPENDING);
ASSYM(PS_NEEDRESCHED, PS_NEEDRESCHED);
-ASSYM(P_ONCPU, offsetof(struct proc, p_oncpu));
-ASSYM(P_LASTCPU, offsetof(struct proc, p_lastcpu));
-
ASSYM(SSLEEP, SSLEEP);
ASSYM(SRUN, SRUN);
ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap));
@@ -132,8 +129,6 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
ASSYM(PCB_DBREGS, PCB_DBREGS);
ASSYM(PCB_EXT, offsetof(struct pcb, pcb_ext));
-ASSYM(PCB_SCHEDNEST, offsetof(struct pcb, pcb_schednest));
-
ASSYM(PCB_SPARE, offsetof(struct pcb, __pcb_spare));
ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags));
ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_savefpu));
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index cbf95cc..256e0ee 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -2056,7 +2056,6 @@ init386(first)
/* setup proc 0's pcb */
proc0.p_addr->u_pcb.pcb_flags = 0;
proc0.p_addr->u_pcb.pcb_cr3 = (int)IdlePTD;
- proc0.p_addr->u_pcb.pcb_schednest = 0;
proc0.p_addr->u_pcb.pcb_ext = 0;
proc0.p_md.md_regs = &proc0_tf;
}
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 93505aa..c780d6f 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -85,10 +85,6 @@ ENTRY(cpu_switch)
testl %ecx,%ecx
jz sw1
- movb P_ONCPU(%ecx), %al /* save "last" cpu */
- movb %al, P_LASTCPU(%ecx)
- movb $0xff, P_ONCPU(%ecx) /* "leave" the cpu */
-
movl P_VMSPACE(%ecx), %edx
movl PCPU(CPUID), %eax
btrl %eax, VM_PMAP+PM_ACTIVE(%edx)
@@ -124,10 +120,6 @@ ENTRY(cpu_switch)
movl %eax,PCB_DR0(%edx)
1:
- /* save sched_lock recursion count */
- movl _sched_lock+MTX_RECURSECNT,%eax
- movl %eax,PCB_SCHEDNEST(%edx)
-
#ifdef SMP
/* XXX FIXME: we should be saving the local APIC TPR */
#endif /* SMP */
@@ -242,9 +234,6 @@ sw1b:
#endif /** CHEAP_TPR */
#endif /** GRAB_LOPRIO */
#endif /* SMP */
- movl PCPU(CPUID),%eax
- movb %al, P_ONCPU(%ecx)
-
movl %edx, PCPU(CURPCB)
movl %ecx, PCPU(CURPROC) /* into next process */
@@ -289,17 +278,6 @@ cpu_switch_load_gs:
movl PCB_DR7(%edx),%eax
movl %eax,%dr7
1:
-
- /*
- * restore sched_lock recursion count and transfer ownership to
- * new process
- */
- movl PCB_SCHEDNEST(%edx),%eax
- movl %eax,_sched_lock+MTX_RECURSECNT
-
- movl PCPU(CURPROC),%eax
- movl %eax,_sched_lock+MTX_LOCK
-
ret
CROSSJUMPTARGET(sw1a)
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index da4f1db..ddf3d77 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -189,7 +189,6 @@ userret(p, frame, oticks)
* mi_switch()'ed, we might not be on the queue indicated by
* our priority.
*/
- clear_resched();
DROP_GIANT_NOSWITCH();
setrunqueue(p);
p->p_stats->p_ru.ru_nivcsw++;
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 434587d..1c5cf8a 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -183,8 +183,6 @@ cpu_fork(p1, p2, flags)
* pcb2->pcb_onfault: cloned above (always NULL here?).
*/
- pcb2->pcb_schednest = 0;
-
/*
* XXX don't copy the i/o pages. this should probably be fixed.
*/
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index f342ea6..618c340 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -71,7 +71,6 @@ struct pcb {
#define FP_SOFTFP 0x01 /* process using software fltng pnt emulator */
#define PCB_DBREGS 0x02 /* process using debug registers */
caddr_t pcb_onfault; /* copyin/out fault recovery */
- int pcb_schednest;
int pcb_gs;
struct pcb_ext *pcb_ext; /* optional pcb extension */
u_long __pcb_spare[3]; /* adjust to avoid core dump size changes */
OpenPOWER on IntegriCloud