PERFORCE change 145324 for review

[Ed Schouten]

http://perforce.freebsd.org/chv.cgi?CH=145324

Change 145324 by ed at ed_dull on 2008/07/16 12:16:47

	IFC my commits, related to TTY's.

Affected files ...

.. //depot/projects/mpsafetty/bin/stty/print.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/mpsafetty/sys/sys/ioctl_compat.h#4 integrate
.. //depot/projects/mpsafetty/sys/sys/ttycom.h#2 edit
.. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#2 edit

Differences ...

==== //depot/projects/mpsafetty/bin/stty/print.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $");
+__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.21 2008/07/16 11:20:04 ed Exp $");
 
 #include <sys/types.h>
 

==== //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#5 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.231 2008/07/15 15:38:47 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.232 2008/07/16 10:55:50 rwatson Exp $");
 
 #include "opt_ipfw.h"
 #include "opt_inet6.h"
@@ -848,9 +848,9 @@
 
 	/*
 	 * Depending on whether or not the application has bound or connected
-	 * the application, we may have to do varying levels of work.  The
-	 * optimal case is for a connected UDP socket, as a global lock isn't
-	 * required.
+	 * the socket, we may have to do varying levels of work.  The optimal
+	 * case is for a connected UDP socket, as a global lock isn't
+	 * required at all.
 	 *
 	 * In order to decide which we need, we require stability of the
 	 * inpcb binding, which we ensure by acquiring a read lock on the

==== //depot/projects/mpsafetty/sys/sys/ioctl_compat.h#4 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.11 2008/06/14 10:42:18 ed Exp $
+ * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.12 2008/07/16 11:20:04 ed Exp $
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_

==== //depot/projects/mpsafetty/sys/sys/ttycom.h#2 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD: src/sys/sys/ttycom.h,v 1.26 2008/04/15 08:33:32 davidxu Exp $
+ * $FreeBSD: src/sys/sys/ttycom.h,v 1.27 2008/07/16 11:23:15 ed Exp $
  */
 
 #ifndef	_SYS_TTYCOM_H_

==== //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.103 2008/05/14 00:22:57 remko Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.104 2008/07/16 11:20:04 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>