PERFORCE change 81437 for review

[Robert Watson]

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

Change 81437 by rwatson at rwatson_zoo on 2005/08/04 10:59:04

	Integrate netsmp:
	
	- Loop back IPv4 multicast locking.
	- Cleanup of UMA-related memstat bits.

Affected files ...

.. //depot/projects/netsmp/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_witness.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet/igmp.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet/in.c#6 integrate
.. //depot/projects/netsmp/src/sys/netinet/in_var.h#8 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/netsmp/src/sys/vm/uma_int.h#2 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_page.h#2 integrate

Differences ...

==== //depot/projects/netsmp/src/sys/dev/usb/ums.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.77 2005/01/06 01:43:28 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.78 2005/08/04 02:21:37 iedowse Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
@@ -114,8 +114,8 @@
 
 	int flags;		/* device configuration */
 #define UMS_Z		0x01	/* z direction available */
-#define UMS_T		0x02	/* aa direction available (tilt) */
 #define UMS_SPUR_BUT_UP	0x02	/* spurious button up events */
+#define UMS_T		0x04	/* aa direction available (tilt) */
 	int nbuttons;
 #define MAX_BUTTONS	7	/* chosen because sc_buttons is u_char */
 
@@ -370,6 +370,7 @@
 			UID_ROOT, GID_OPERATOR,
 			0644, "ums%d", device_get_unit(self));
 
+	usb_callout_init(sc->callout_handle);
 	if (usbd_get_quirks(uaa->device)->uq_flags & UQ_SPUR_BUT_UP) {
 		DPRINTF(("%s: Spurious button up events\n",
 			USBDEVNAME(sc->sc_dev)));

==== //depot/projects/netsmp/src/sys/kern/subr_witness.c#4 (text+ko) ====

@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.195 2005/06/04 23:24:50 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.196 2005/08/03 19:29:47 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_witness.h"

==== //depot/projects/netsmp/src/sys/netinet/igmp.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $FreeBSD: src/sys/netinet/igmp.c,v 1.48 2005/03/26 22:20:22 sam Exp $
+ * $FreeBSD: src/sys/netinet/igmp.c,v 1.49 2005/08/03 19:29:46 rwatson Exp $
  */
 
 /*

==== //depot/projects/netsmp/src/sys/netinet/in.c#6 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/in.c,v 1.85 2005/06/02 00:04:08 iedowse Exp $
+ * $FreeBSD: src/sys/netinet/in.c,v 1.86 2005/08/03 19:29:46 rwatson Exp $
  */
 
 #include "opt_carp.h"

==== //depot/projects/netsmp/src/sys/netinet/in_var.h#8 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/in_var.h,v 1.54 2005/08/02 23:51:22 rwatson Exp $
+ * $FreeBSD: src/sys/netinet/in_var.h,v 1.55 2005/08/03 19:29:46 rwatson Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_

==== //depot/projects/netsmp/src/sys/netinet/ip_input.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.302 2005/07/19 12:14:22 rwatson Exp $
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.303 2005/08/03 19:29:46 rwatson Exp $
  */
 
 #include "opt_bootp.h"

==== //depot/projects/netsmp/src/sys/netinet/ip_output.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/netinet/ip_output.c,v 1.242 2005/07/05 23:39:50 rwatson Exp $
+ * $FreeBSD: src/sys/netinet/ip_output.c,v 1.243 2005/08/03 19:29:46 rwatson Exp $
  */
 
 #include "opt_ipfw.h"

==== //depot/projects/netsmp/src/sys/vm/uma_int.h#2 (text+ko) ====

@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/vm/uma_int.h,v 1.36 2005/07/16 09:51:52 rwatson Exp $
+ * $FreeBSD: src/sys/vm/uma_int.h,v 1.37 2005/08/04 10:03:53 rwatson Exp $
  *
  */
 
@@ -323,6 +323,7 @@
 #define UMA_ZFLAG_FULL		0x40000000	/* Reached uz_maxpages */
 #define UMA_ZFLAG_CACHEONLY	0x80000000	/* Don't ask VM for buckets. */
 
+#ifdef _KERNEL
 /* Internal prototypes */
 static __inline uma_slab_t hash_sfind(struct uma_hash *hash, u_int8_t *data);
 void *uma_large_malloc(int size, int wait);
@@ -412,5 +413,6 @@
  */
 void *uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait);
 void uma_small_free(void *mem, int size, u_int8_t flags);
+#endif /* _KERNEL */
 
 #endif /* VM_UMA_INT_H */

==== //depot/projects/netsmp/src/sys/vm/vm_page.h#2 (text+ko) ====

@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD: src/sys/vm/vm_page.h,v 1.136 2005/01/07 02:29:27 imp Exp $
+ * $FreeBSD: src/sys/vm/vm_page.h,v 1.137 2005/08/04 10:05:11 rwatson Exp $
  */
 
 /*
@@ -67,7 +67,7 @@
 #ifndef	_VM_PAGE_
 #define	_VM_PAGE_
 
-#if !defined(KLD_MODULE)
+#if !defined(KLD_MODULE) && !defined(LIBMEMSTAT)
 #include "opt_vmpage.h"
 #endif