PERFORCE change 129951 for review
Peter Wemm
peter at FreeBSD.org
Sat Dec 1 17:28:18 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129951
Change 129951 by peter at peter_daintree on 2007/12/02 01:27:46
nuke P_SA
Affected files ...
.. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#3 edit
.. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#3 edit
.. //depot/projects/bike_sched/sys/fs/procfs/procfs_status.c#3 edit
.. //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#3 edit
.. //depot/projects/bike_sched/sys/sys/proc.h#7 edit
Differences ...
==== //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ====
@@ -247,8 +247,7 @@
Elf32_Addr *base;
Elf32_Addr *pos;
- KASSERT(curthread->td_proc == imgp->proc &&
- (curthread->td_proc->p_flag & P_SA) == 0,
+ KASSERT(curthread->td_proc == imgp->proc,
("unsafe elf_linux_fixup(), should be curproc"));
base = (Elf32_Addr *)*stack_base;
args = (Elf32_Auxargs *)imgp->auxargs;
==== //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#3 (text+ko) ====
@@ -213,8 +213,7 @@
Elf32_Auxargs *args;
register_t *pos;
- KASSERT(curthread->td_proc == imgp->proc &&
- (curthread->td_proc->p_flag & P_SA) == 0,
+ KASSERT(curthread->td_proc == imgp->proc,
("unsafe svr4_fixup(), should be curproc"));
args = (Elf32_Auxargs *)imgp->auxargs;
pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);
==== //depot/projects/bike_sched/sys/fs/procfs/procfs_status.c#3 (text+ko) ====
@@ -112,20 +112,13 @@
sbuf_printf(sb, "noflags");
}
-#ifdef KSE
- if (p->p_flag & P_SA)
- wmesg = "-kse- ";
- else
-#endif
- {
- tdfirst = FIRST_THREAD_IN_PROC(p);
- if (tdfirst->td_wchan != NULL) {
- KASSERT(tdfirst->td_wmesg != NULL,
- ("wchan %p has no wmesg", tdfirst->td_wchan));
- wmesg = tdfirst->td_wmesg;
- } else
- wmesg = "nochan";
- }
+ tdfirst = FIRST_THREAD_IN_PROC(p);
+ if (tdfirst->td_wchan != NULL) {
+ KASSERT(tdfirst->td_wmesg != NULL,
+ ("wchan %p has no wmesg", tdfirst->td_wchan));
+ wmesg = tdfirst->td_wmesg;
+ } else
+ wmesg = "nochan";
if (p->p_flag & P_INMEM) {
struct timeval start, ut, st;
==== //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#3 (text+ko) ====
@@ -239,8 +239,7 @@
Elf32_Auxargs *args;
register_t *pos;
- KASSERT(curthread->td_proc == imgp->proc &&
- (curthread->td_proc->p_flag & P_SA) == 0,
+ KASSERT(curthread->td_proc == imgp->proc,
("unsafe elf_linux_fixup(), should be curproc"));
args = (Elf32_Auxargs *)imgp->auxargs;
pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);
==== //depot/projects/bike_sched/sys/sys/proc.h#7 (text+ko) ====
@@ -553,7 +553,6 @@
#define P_WAITED 0x01000 /* Someone is waiting for us. */
#define P_WEXIT 0x02000 /* Working on exiting. */
#define P_EXEC 0x04000 /* Process called exec. */
-#define P_SA 0x08000 /* Using scheduler activations. */
#define P_CONTINUED 0x10000 /* Proc has continued from a stopped state. */
#define P_STOPPED_SIG 0x20000 /* Stopped due to SIGSTOP/SIGTSTP. */
#define P_STOPPED_TRACE 0x40000 /* Stopped because of tracing. */
More information about the p4-projects
mailing list