Date: Mon, 28 Oct 2002 13:12:49 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20308 for review Message-ID: <200210282112.g9SLCnrc029600@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20308 Change 20308 by rwatson@rwatson_tislabs on 2002/10/28 13:12:28 Prepare to merge: remove dup include (probably from integ), follow style(9) for #endif's. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#19 (text+ko) ==== @@ -50,7 +50,6 @@ #include <sys/mac.h> #include <sys/mutex.h> #include <sys/proc.h> -#include <sys/mac.h> #include <sys/kse.h> #include <sys/ktr.h> #include <sys/resourcevar.h> @@ -183,7 +182,7 @@ p->p_sflag &= ~(PS_ALRMPEND | PS_NEEDSIGCHK | PS_PROFPEND | PS_XCPU); #ifdef MAC p->p_sflag &= ~PS_MACPEND; -#endif /* MAC */ +#endif ke->ke_flags &= ~(KEF_ASTPENDING | KEF_NEEDRESCHED | KEF_OWEUPC); cnt.v_soft++; prticks = 0; @@ -241,7 +240,7 @@ #ifdef MAC if (sflag & PS_MACPEND) mac_thread_userret(td); -#endif /* MAC */ +#endif if (flags & KEF_NEEDRESCHED) { mtx_lock_spin(&sched_lock); sched_prio(td, kg->kg_user_pri); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210282112.g9SLCnrc029600>