Date: Mon, 12 Dec 2011 22:54:32 +0100 From: Attilio Rao <attilio@freebsd.org> To: Andriy Gapon <avg@freebsd.org> Cc: Kostik Belousov <kostikbel@gmail.com>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228433 - in head/sys: kern security/mac Message-ID: <CAJ-FndBnhozFDg2bgEJtFGX887TmMz9yUmdtgHGPZFqqGSM7QA@mail.gmail.com> In-Reply-To: <4EE636BB.7050008@FreeBSD.org> References: <201112121005.pBCA5Dar093711@svn.freebsd.org> <20111212101558.GK50300@deviant.kiev.zoral.com.ua> <4EE5D574.9080303@FreeBSD.org> <CAJ-FndDJbrTT0u1Hz_0MLJiEq3G0qcq77jBqfttVeUgiR414=g@mail.gmail.com> <CAJ-FndBSBuoR4=cdjs0QgN4SAR-uJ39Kpw4EV_yjU97c=uyU0w@mail.gmail.com> <4EE636BB.7050008@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2011/12/12 Andriy Gapon <avg@freebsd.org>: > on 12/12/2011 19:05 Attilio Rao said the following: >> More precisely, what do you think about the patch below? >> I just didn't revert the moving of systm.h under param.h because Bruce >> seems to prefer that. >> >> I'm starting test-compile right now, let me know your preference. > > The patch looks good to me. > >> Index: sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c >> (revision 228438) >> +++ sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c =C2=A0 =C2= =A0 (working copy) >> @@ -5877,6 +5877,9 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintp >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 volatile uint16_t *flags; >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 hrtime_t now; >> >> + =C2=A0 =C2=A0 =C2=A0 if (SCHEDULER_STOPPED()) >> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return; >> + > > I think that this could even be "panicstr !=3D NULL", there is probably n= o use for > DTrace at panic time. I agree, I will go with panicstr. > >> =C2=A0#if defined(sun) >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* Kick out immediately if this CPU is = still being born (in which case >> Index: sys/security/mac/mac_priv.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- sys/security/mac/mac_priv.c (revision 228438) >> +++ sys/security/mac/mac_priv.c (working copy) >> @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); >> =C2=A0#include "opt_mac.h" >> >> =C2=A0#include <sys/param.h> >> -#include <sys/systm.h> >> =C2=A0#include <sys/kernel.h> >> =C2=A0#include <sys/priv.h> >> =C2=A0#include <sys/sdt.h> > > I would even keep this inclusion, just for the "why not" reason. If it passes testing I will remove it as it is unneeded. Attilio --=20 Peace can only be achieved by understanding - A. Einstein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-FndBnhozFDg2bgEJtFGX887TmMz9yUmdtgHGPZFqqGSM7QA>