Revert r210225 - turns out I was wrong; the "/*-" is not license-only

thing; it's also used to indicate that the comment should not be automatically
rewrapped.

Explained by:	cperciva@

9 files changed, 26 insertions, 26 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 5c2f738..d608e25 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -539,7 +539,7 @@ proc0_init(void *dummy __unused)
 	vm_map_init(&vmspace0.vm_map, vmspace_pmap(&vmspace0),
 	    p->p_sysent->sv_minuser, p->p_sysent->sv_maxuser);
 
-	/*
+	/*-
 	 * call the init and ctor for the new thread and proc
 	 * we wait to do this until all other structures
 	 * are fairly sane.
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 3ee6f05..16b0f37 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1316,7 +1316,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_uids, CTLFLAG_RW,
     &see_other_uids, 0,
     "Unprivileged processes may see subjects/objects with different real uid");
 
-/*
+/*-
  * Determine if u1 "can see" the subject specified by u2, according to the
  * 'see_other_uids' policy.
  * Returns: 0 for permitted, ESRCH otherwise
@@ -1375,7 +1375,7 @@ cr_seeothergids(struct ucred *u1, struct ucred *u2)
 	return (0);
 }
 
-/*
+/*-
  * Determine if u1 "can see" the subject specified by u2.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: none
@@ -1400,7 +1400,7 @@ cr_cansee(struct ucred *u1, struct ucred *u2)
 	return (0);
 }
 
-/*
+/*-
  * Determine if td "can see" the subject specified by p.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: Sufficient locks to protect p->p_ucred must be held.  td really
@@ -1431,7 +1431,7 @@ static int	conservative_signals = 1;
 SYSCTL_INT(_security_bsd, OID_AUTO, conservative_signals, CTLFLAG_RW,
     &conservative_signals, 0, "Unprivileged processes prevented from "
     "sending certain signals to processes whose credentials have changed");
-/*
+/*-
  * Determine whether cred may deliver the specified signal to proc.
  * Returns: 0 for permitted, an errno value otherwise.
  * Locks: A lock must be held for proc.
@@ -1507,7 +1507,7 @@ cr_cansignal(struct ucred *cred, struct proc *proc, int signum)
 	return (0);
 }
 
-/*
+/*-
  * Determine whether td may deliver the specified signal to p.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: Sufficient locks to protect various components of td and p
@@ -1548,7 +1548,7 @@ p_cansignal(struct thread *td, struct proc *p, int signum)
 	return (cr_cansignal(td->td_ucred, p, signum));
 }
 
-/*
+/*-
  * Determine whether td may reschedule p.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: Sufficient locks to protect various components of td and p
@@ -1600,7 +1600,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_proc_debug, CTLFLAG_RW,
     &unprivileged_proc_debug, 0,
     "Unprivileged processes may use process debugging facilities");
 
-/*
+/*-
  * Determine whether td may debug p.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: Sufficient locks to protect various components of td and p
@@ -1698,7 +1698,7 @@ p_candebug(struct thread *td, struct proc *p)
 	return (0);
 }
 
-/*
+/*-
  * Determine whether the subject represented by cred can "see" a socket.
  * Returns: 0 for permitted, ENOENT otherwise.
  */
@@ -1724,7 +1724,7 @@ cr_canseesocket(struct ucred *cred, struct socket *so)
 }
 
 #if defined(INET) || defined(INET6)
-/*
+/*-
  * Determine whether the subject represented by cred can "see" a socket.
  * Returns: 0 for permitted, ENOENT otherwise.
  */
@@ -1751,7 +1751,7 @@ cr_canseeinpcb(struct ucred *cred, struct inpcb *inp)
 }
 #endif
 
-/*
+/*-
  * Determine whether td can wait for the exit of p.
  * Returns: 0 for permitted, an errno value otherwise
  * Locks: Sufficient locks to protect various components of td and p
@@ -2112,7 +2112,7 @@ setsugid(struct proc *p)
 		p->p_stops = 0;
 }
 
-/*
+/*-
  * Change a process's effective uid.
  * Side effects: newcred->cr_uid and newcred->cr_uidinfo will be modified.
  * References: newcred must be an exclusive credential reference for the
@@ -2128,7 +2128,7 @@ change_euid(struct ucred *newcred, struct uidinfo *euip)
 	newcred->cr_uidinfo = euip;
 }
 
-/*
+/*-
  * Change a process's effective gid.
  * Side effects: newcred->cr_gid will be modified.
  * References: newcred must be an exclusive credential reference for the
@@ -2141,7 +2141,7 @@ change_egid(struct ucred *newcred, gid_t egid)
 	newcred->cr_groups[0] = egid;
 }
 
-/*
+/*-
  * Change a process's real uid.
  * Side effects: newcred->cr_ruid will be updated, newcred->cr_ruidinfo
  *               will be updated, and the old and new cr_ruidinfo proc
@@ -2161,7 +2161,7 @@ change_ruid(struct ucred *newcred, struct uidinfo *ruip)
 	(void)chgproccnt(newcred->cr_ruidinfo, 1, 0);
 }
 
-/*
+/*-
  * Change a process's real gid.
  * Side effects: newcred->cr_rgid will be updated.
  * References: newcred must be an exclusive credential reference for the
@@ -2174,7 +2174,7 @@ change_rgid(struct ucred *newcred, gid_t rgid)
 	newcred->cr_rgid = rgid;
 }
 
-/*
+/*-
  * Change a process's saved uid.
  * Side effects: newcred->cr_svuid will be updated.
  * References: newcred must be an exclusive credential reference for the
@@ -2187,7 +2187,7 @@ change_svuid(struct ucred *newcred, uid_t svuid)
 	newcred->cr_svuid = svuid;
 }
 
-/*
+/*-
  * Change a process's saved gid.
  * Side effects: newcred->cr_svgid will be updated.
  * References: newcred must be an exclusive credential reference for the
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 4c8db61..ec2d6b6 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1247,7 +1247,7 @@ uihold(uip)
 	refcount_acquire(&uip->ui_ref);
 }
 
-/*
+/*-
  * Since uidinfo structs have a long lifetime, we use an
  * opportunistic refcounting scheme to avoid locking the lookup hash
  * for each release.
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index a67a603..d973348 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -484,7 +484,7 @@ tc_windup(void)
 		th->th_offset_count = ncount;
 	}
 
-	/*
+	/*-
 	 * Recalculate the scaling factor.  We want the number of 1/2^64
 	 * fractions of a second per period of the hardware counter, taking
 	 * into account the th_adjustment factor which the NTP PLL/adjtime(2)
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 28b0e5e..12b0159 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/disk.h>
 #include <geom/geom_disk.h>
 
-/*
+/*-
  * Disk error is the preface to plaintive error messages
  * about failing disk transfers.  It prints messages of the form
  * 	"hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347"
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index aa8a584..be98d44 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -254,7 +254,7 @@ kmstartup(dummy)
 	mcount_overhead -= empty_loop_time;
 	mexitcount_overhead -= empty_loop_time;
 
-	/*
+	/*-
 	 * Profiling overheads are determined by the times between the
 	 * following events:
 	 *	MC1: mcount() is called
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index f932f0a..4e9ff6e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -161,7 +161,7 @@ m_freem(struct mbuf *mb)
 		mb = m_free(mb);
 }
 
-/*
+/*-
  * Configure a provided mbuf to refer to the provided external storage
  * buffer and setup a reference count for said buffer.  If the setting
  * up of the reference count fails, the M_EXT bit will not be set.  If
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 63437bc..fdf3d902 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -165,7 +165,7 @@ SYSCTL_ULONG(_net_local_seqpacket, OID_AUTO, recvspace, CTLFLAG_RW,
 SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, 
     "File descriptors in flight.");
 
-/*
+/*-
  * Locking and synchronization:
  *
  * Three types of locks exit in the local domain socket implementation: a
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index cfff70f..e7bf2d1 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -149,7 +149,7 @@ out:
 	return (error);
 }
 
-/*
+/*-
  * Set a named extended attribute on a file or directory
  *
  * Arguments: unlocked vnode "vp", attribute namespace "attrnamespace",
@@ -317,7 +317,7 @@ extattr_set_link(td, uap)
 	return (error);
 }
 
-/*
+/*-
  * Get a named extended attribute on a file or directory
  *
  * Arguments: unlocked vnode "vp", attribute namespace "attrnamespace",
@@ -638,7 +638,7 @@ extattr_delete_link(td, uap)
 	return(error);
 }
 
-/*
+/*-
  * Retrieve a list of extended attributes on a file or directory.
  *
  * Arguments: unlocked vnode "vp", attribute namespace 'attrnamespace",