Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Mar 2010 17:26:19 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 175480 for review
Message-ID:  <201003081726.o28HQJik004177@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=175480

Change 175480 by hselasky@hselasky_laptop001 on 2010/03/08 17:25:43

	
	IFC @ 175475
		- more files to revert

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#4 integrate
.. //depot/projects/usb/src/sys/sys/systm.h#24 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: head/sys/dev/usb/wlan/if_uralreg.h 188942 2009-02-23 18:31:00Z thompsa $	*/
+/*	$FreeBSD: src/sys/dev/usb/wlan/if_uralreg.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD: head/sys/dev/usb/wlan/if_zydfw.h 188942 2009-02-23 18:31:00Z thompsa $	*/
+/*	$FreeBSD: src/sys/dev/usb/wlan/if_zydfw.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $	*/
 
 uint8_t zd1211_firmware[] = {
 	0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE,

==== //depot/projects/usb/src/sys/sys/systm.h#24 (text+ko) ====

@@ -341,8 +341,15 @@
 /* XXX: Should be void nanodelay(u_int nsec); */
 void	DELAY(int usec);
 
+/* Root mount holdback API */
+struct root_hold_token;
+
+struct root_hold_token *root_mount_hold(const char *identifier);
+void root_mount_rel(struct root_hold_token *h);
+void root_mount_wait(void);
 int root_mounted(void);
 
+
 /*
  * Unit number allocation API. (kern/subr_unit.c)
  */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003081726.o28HQJik004177>