Date: Tue, 11 Mar 2003 12:38:24 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26717 for review Message-ID: <200303112038.h2BKcOqJ075447@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26717 Change 26717 by jhb@jhb_laptop on 2003/03/11 12:38:03 IFC @26713 (sync back some committed changes) Affected files ... .. //depot/projects/smpng/sys/conf/NOTES#37 integrate .. //depot/projects/smpng/sys/conf/files#66 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#7 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#19 integrate .. //depot/projects/smpng/sys/modules/rndtest/Makefile#1 branch .. //depot/projects/smpng/sys/sys/eventhandler.h#16 integrate .. //depot/projects/smpng/sys/sys/ktr.h#14 integrate .. //depot/projects/smpng/sys/sys/mutex.h#34 integrate Differences ... ==== //depot/projects/smpng/sys/conf/NOTES#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1137 2003/03/09 11:50:26 akiyama Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1138 2003/03/11 19:26:15 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2154,6 +2154,7 @@ device hifn # Hifn 7951, 7781, etc. device ubsec # Broadcom 5501, 5601, 58xx +device rndtest # FIPS 140-2 entropy tester ##################################################################### ==== //depot/projects/smpng/sys/conf/files#66 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.769 2003/03/10 23:25:54 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.770 2003/03/11 19:26:15 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -629,6 +629,7 @@ dev/ray/if_ray.c optional ray card dev/ray/if_ray.c optional ray pccard dev/rc/rc.c optional rc +dev/rndtest/rndtest.c optional rndtest dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci ==== //depot/projects/smpng/sys/i386/include/bus_at386.h#7 (text+ko) ==== @@ -67,7 +67,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/i386/include/bus_at386.h,v 1.20 2003/02/26 02:16:06 mux Exp $ */ +/* $FreeBSD: src/sys/i386/include/bus_at386.h,v 1.21 2003/03/11 19:43:38 jake Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ @@ -854,7 +854,7 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -876,7 +876,7 @@ bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -898,7 +898,7 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -942,7 +942,7 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -964,7 +964,7 @@ bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -986,7 +986,7 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { - bus_addr_t addr = bsh + offset; + bus_space_handle_t addr = bsh + offset; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -1036,8 +1036,8 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; + bus_space_handle_t addr1 = bsh1 + off1; + bus_space_handle_t addr2 = bsh2 + off2; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -1082,8 +1082,8 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; + bus_space_handle_t addr1 = bsh1 + off1; + bus_space_handle_t addr2 = bsh2 + off2; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) @@ -1128,8 +1128,8 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { - bus_addr_t addr1 = bsh1 + off1; - bus_addr_t addr2 = bsh2 + off2; + bus_space_handle_t addr1 = bsh1 + off1; + bus_space_handle_t addr2 = bsh2 + off2; #if defined(_I386_BUS_PIO_H_) #if defined(_I386_BUS_MEMIO_H_) ==== //depot/projects/smpng/sys/kern/kern_ktr.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.34 2003/02/22 23:30:37 jake Exp $ + * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.35 2003/03/11 19:56:16 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/kern/kern_lock.c#23 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/kern/kern_lock.c,v 1.66 2003/03/04 21:03:04 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_lock.c,v 1.67 2003/03/11 20:00:37 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/kern/kern_mutex.c#63 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.121 2003/03/04 21:32:25 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.122 2003/03/11 20:02:57 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#30 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.141 2003/03/04 21:03:04 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.142 2003/03/11 20:01:51 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/subr_eventhandler.c#19 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.19 2002/07/19 17:44:44 mux Exp $ + * $FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.20 2003/03/11 20:17:00 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/sys/eventhandler.h#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/eventhandler.h,v 1.25 2002/11/21 09:17:56 jeff Exp $ + * $FreeBSD: src/sys/sys/eventhandler.h,v 1.26 2003/03/11 20:17:00 jhb Exp $ */ #ifndef SYS_EVENTHANDLER_H ==== //depot/projects/smpng/sys/sys/ktr.h#14 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $ - * $FreeBSD: src/sys/sys/ktr.h,v 1.20 2002/09/22 07:13:45 jeff Exp $ + * $FreeBSD: src/sys/sys/ktr.h,v 1.21 2003/03/11 20:07:22 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/sys/mutex.h#34 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/mutex.h,v 1.58 2002/12/28 22:29:10 phk Exp $ + * $FreeBSD: src/sys/sys/mutex.h,v 1.59 2003/03/11 20:02:57 jhb Exp $ */ #ifndef _SYS_MUTEX_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303112038.h2BKcOqJ075447>