From owner-p4-projects@FreeBSD.ORG Sun Jun 29 00:13:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED9F937B404; Sun, 29 Jun 2003 00:13:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8716A37B401 for ; Sun, 29 Jun 2003 00:13:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1052D44020 for ; Sun, 29 Jun 2003 00:13:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5T7DQ0U091036 for ; Sun, 29 Jun 2003 00:13:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5T7DQKe091029 for perforce@freebsd.org; Sun, 29 Jun 2003 00:13:26 -0700 (PDT) Date: Sun, 29 Jun 2003 00:13:26 -0700 (PDT) Message-Id: <200306290713.h5T7DQKe091029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 07:13:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=33833 Change 33833 by marcel@marcel_nfs on 2003/06/29 00:13:07 Hook-up the uart(4) driver. We'll make a module later. Affected files ... .. //depot/projects/uart/conf/files#2 edit .. //depot/projects/uart/conf/files.alpha#2 edit .. //depot/projects/uart/conf/files.i386#2 edit .. //depot/projects/uart/conf/files.ia64#2 edit .. //depot/projects/uart/conf/files.sparc64#2 edit Differences ... ==== //depot/projects/uart/conf/files#2 (text+ko) ==== @@ -767,6 +767,18 @@ dev/twe/twe_freebsd.c optional twe dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp +dev/uart/uart_if.m optional uart +dev/uart/uart_dev_ns8250.c optional uart +dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_bus_acpi.c optional uart acpi +dev/uart/uart_bus_ebus.c optional uart ebus +dev/uart/uart_bus_isa.c optional uart isa +dev/uart/uart_bus_pci.c optional uart cardbus +dev/uart/uart_bus_pci.c optional uart pci +dev/uart/uart_bus_puc.c optional uart puc +dev/uart/uart_cons.c optional uart +dev/uart/uart_core.c optional uart +dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support ==== //depot/projects/uart/conf/files.alpha#2 (text+ko) ==== @@ -191,6 +191,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_alpha.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd ==== //depot/projects/uart/conf/files.i386#2 (text+ko) ==== @@ -152,6 +152,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard ==== //depot/projects/uart/conf/files.ia64#2 (text+ko) ==== @@ -59,6 +59,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_ia64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_gpt.c standard ==== //depot/projects/uart/conf/files.sparc64#2 (text+ko) ==== @@ -18,6 +18,7 @@ dev/ofw/openpromio.c standard dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa +dev/uart/uart_cpu_sparc64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard From owner-p4-projects@FreeBSD.ORG Sun Jun 29 10:21:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56B0737B404; Sun, 29 Jun 2003 10:21:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05E0E37B401 for ; Sun, 29 Jun 2003 10:21:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D50B43FE1 for ; Sun, 29 Jun 2003 10:21:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5THLj0U096075 for ; Sun, 29 Jun 2003 10:21:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5THLjcD096069 for perforce@freebsd.org; Sun, 29 Jun 2003 10:21:45 -0700 (PDT) Date: Sun, 29 Jun 2003 10:21:45 -0700 (PDT) Message-Id: <200306291721.h5THLjcD096069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33843 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 17:21:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=33843 Change 33843 by marcel@marcel_nfs on 2003/06/29 10:20:52 Fix the creation of a fake tag. Use of barriers is fundamental given the newbus semantics, so drivers cannot be assumed to not use barriers on fake tags. The barrier code does not handle NULL functions, so we better have the barrier function point to something or otherwise make sure we have a parent. We opted to set the barrier function to that of nexus. Affected files ... .. //depot/projects/uart/sparc64/sparc64/bus_machdep.c#2 edit Differences ... ==== //depot/projects/uart/sparc64/sparc64/bus_machdep.c#2 (text+ko) ==== @@ -135,6 +135,9 @@ #include #include +static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t, + bus_size_t, bus_size_t, int); + /* ASI's for bus access. */ int bus_type_asi[] = { ASI_PHYS_BYPASS_EC_WITH_EBIT, /* UPA */ @@ -712,7 +715,6 @@ /* * Fake up a bus tag, for use by console drivers in early boot when the regular * means to allocate resources are not yet available. - * Note that these tags are not eligible for bus_space_barrier operations. * Addr is the physical address of the desired start of the handle. */ bus_space_handle_t @@ -722,15 +724,13 @@ ptag->bst_cookie = NULL; ptag->bst_parent = NULL; ptag->bst_type = space; - ptag->bst_bus_barrier = NULL; + ptag->bst_bus_barrier = nexus_bus_barrier; return (addr); } /* * Base bus space handlers. */ -static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_size_t, int); static void nexus_bus_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset, From owner-p4-projects@FreeBSD.ORG Sun Jun 29 10:22:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B90337B404; Sun, 29 Jun 2003 10:22:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F234637B401 for ; Sun, 29 Jun 2003 10:22:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 854A443FFB for ; Sun, 29 Jun 2003 10:22:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5THMl0U096745 for ; Sun, 29 Jun 2003 10:22:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5THMl2l096737 for perforce@freebsd.org; Sun, 29 Jun 2003 10:22:47 -0700 (PDT) Date: Sun, 29 Jun 2003 10:22:47 -0700 (PDT) Message-Id: <200306291722.h5THMl2l096737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 17:22:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=33844 Change 33844 by marcel@marcel_nfs on 2003/06/29 10:22:36 Remove stale call to pci_get_devid(). We give it the id. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_pci.c#2 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#2 (text+ko) ==== @@ -86,7 +86,7 @@ static struct pci_id * uart_pci_match(uint32_t type, struct pci_id *id) { - type = pci_get_devid(dev); + while (id->type && id->type != type) id++; return ((id->type) ? id : NULL); From owner-p4-projects@FreeBSD.ORG Sun Jun 29 13:10:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7361E37B404; Sun, 29 Jun 2003 13:10:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF6B637B401 for ; Sun, 29 Jun 2003 13:10:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E920E43F93 for ; Sun, 29 Jun 2003 13:10:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TKAD0U054344 for ; Sun, 29 Jun 2003 13:10:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TKADaD054341 for perforce@freebsd.org; Sun, 29 Jun 2003 13:10:13 -0700 (PDT) Date: Sun, 29 Jun 2003 13:10:13 -0700 (PDT) Message-Id: <200306292010.h5TKADaD054341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33851 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 20:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=33851 Change 33851 by marcel@marcel_nfs on 2003/06/29 13:09:38 IFC @33848 Affected files ... .. //depot/projects/ia64/bin/csh/Makefile#9 integrate .. //depot/projects/ia64/bin/ed/Makefile#7 integrate .. //depot/projects/ia64/contrib/isc-dhcp/includes/cf/freebsd.h#4 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#8 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#17 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#5 integrate .. //depot/projects/ia64/etc/rc.d/atm2.sh#5 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#6 integrate .. //depot/projects/ia64/etc/rc.d/ip6fw#3 integrate .. //depot/projects/ia64/etc/rc.d/mrouted#5 integrate .. //depot/projects/ia64/etc/rc.d/netif#2 integrate .. //depot/projects/ia64/etc/rc.d/netoptions#2 integrate .. //depot/projects/ia64/etc/rc.d/network2#4 integrate .. //depot/projects/ia64/etc/rc.d/network3#5 integrate .. //depot/projects/ia64/etc/rc.d/network_ipv6#6 integrate .. //depot/projects/ia64/etc/rc.d/routed#6 integrate .. //depot/projects/ia64/etc/rc.d/routing#2 integrate .. //depot/projects/ia64/include/paths.h#11 integrate .. //depot/projects/ia64/include/unistd.h#17 integrate .. //depot/projects/ia64/lib/libc/gen/exec.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/exec.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.c#4 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#58 integrate .. //depot/projects/ia64/rescue/Makefile#1 branch .. //depot/projects/ia64/rescue/README#1 branch .. //depot/projects/ia64/rescue/librescue/Makefile#1 branch .. //depot/projects/ia64/rescue/rescue/Makefile#1 branch .. //depot/projects/ia64/sbin/dhclient/Makefile#5 integrate .. //depot/projects/ia64/sbin/dhclient/client/Makefile#2 integrate .. //depot/projects/ia64/sbin/fsck/fsck.c#10 integrate .. //depot/projects/ia64/sbin/fsck/pathnames.h#2 delete .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#7 integrate .. //depot/projects/ia64/sbin/mdmfs/pathnames.h#3 delete .. //depot/projects/ia64/sbin/mount/mount.c#9 integrate .. //depot/projects/ia64/sbin/mount/pathnames.h#2 integrate .. //depot/projects/ia64/share/man/man4/aac.4#4 integrate .. //depot/projects/ia64/share/man/man4/aha.4#2 integrate .. //depot/projects/ia64/share/man/man4/ahb.4#2 integrate .. //depot/projects/ia64/share/man/man4/ahc.4#4 integrate .. //depot/projects/ia64/share/man/man4/atkbd.4#3 integrate .. //depot/projects/ia64/share/man/man4/awi.4#3 integrate .. //depot/projects/ia64/share/man/man4/bktr.4#4 integrate .. //depot/projects/ia64/share/man/man4/blackhole.4#3 integrate .. //depot/projects/ia64/share/man/man4/bpf.4#5 integrate .. //depot/projects/ia64/share/man/man4/bt.4#2 integrate .. //depot/projects/ia64/share/man/man4/cd.4#4 integrate .. //depot/projects/ia64/share/man/man4/ch.4#3 integrate .. //depot/projects/ia64/share/man/man4/da.4#5 integrate .. //depot/projects/ia64/share/man/man4/ddb.4#4 integrate .. //depot/projects/ia64/share/man/man4/divert.4#3 integrate .. //depot/projects/ia64/share/man/man4/fpa.4#3 integrate .. //depot/projects/ia64/share/man/man4/icmp.4#3 integrate .. //depot/projects/ia64/share/man/man4/ifmib.4#4 integrate .. //depot/projects/ia64/share/man/man4/inet.4#4 integrate .. //depot/projects/ia64/share/man/man4/intro.4#7 integrate .. //depot/projects/ia64/share/man/man4/ip6.4#3 integrate .. //depot/projects/ia64/share/man/man4/kld.4#4 integrate .. //depot/projects/ia64/share/man/man4/lp.4#2 integrate .. //depot/projects/ia64/share/man/man4/lpt.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/pae.4#4 integrate .. //depot/projects/ia64/share/man/man4/matcd.4#2 integrate .. //depot/projects/ia64/share/man/man4/mem.4#3 integrate .. //depot/projects/ia64/share/man/man4/mtio.4#3 integrate .. //depot/projects/ia64/share/man/man4/natm.4#5 integrate .. //depot/projects/ia64/share/man/man4/netgraph.4#4 integrate .. //depot/projects/ia64/share/man/man4/netintro.4#6 integrate .. //depot/projects/ia64/share/man/man4/ng_ksocket.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_l2cap.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_ppp.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_pppoe.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_socket.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_vjc.4#2 integrate .. //depot/projects/ia64/share/man/man4/pass.4#2 integrate .. //depot/projects/ia64/share/man/man4/pci.4#3 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#5 integrate .. //depot/projects/ia64/share/man/man4/polling.4#6 integrate .. //depot/projects/ia64/share/man/man4/ppi.4#2 integrate .. //depot/projects/ia64/share/man/man4/ppp.4#3 integrate .. //depot/projects/ia64/share/man/man4/psm.4#4 integrate .. //depot/projects/ia64/share/man/man4/pt.4#2 integrate .. //depot/projects/ia64/share/man/man4/pty.4#2 integrate .. //depot/projects/ia64/share/man/man4/route.4#4 integrate .. //depot/projects/ia64/share/man/man4/sa.4#2 integrate .. //depot/projects/ia64/share/man/man4/scsi.4#2 integrate .. //depot/projects/ia64/share/man/man4/si.4#2 integrate .. //depot/projects/ia64/share/man/man4/sio.4#7 integrate .. //depot/projects/ia64/share/man/man4/sl.4#2 integrate .. //depot/projects/ia64/share/man/man4/smp.4#5 integrate .. //depot/projects/ia64/share/man/man4/syncer.4#4 integrate .. //depot/projects/ia64/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/ia64/share/man/man4/termios.4#3 integrate .. //depot/projects/ia64/share/man/man4/ti.4#5 integrate .. //depot/projects/ia64/share/man/man4/ttcp.4#2 integrate .. //depot/projects/ia64/share/man/man4/tty.4#2 integrate .. //depot/projects/ia64/share/man/man4/udp.4#2 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#21 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#17 integrate .. //depot/projects/ia64/sys/alpha/alpha/support.s#7 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#68 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#33 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#33 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/ia64/sys/sys/param.h#36 integrate Differences ... ==== //depot/projects/ia64/bin/csh/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.32 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.33 2003/06/29 18:46:17 gordon Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -10,7 +10,11 @@ .PATH: ${TCSHDIR} PROG= csh +.if defined(RESCUE) +DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG}"' +.else DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' +.endif CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} WARNS= 2 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ ==== //depot/projects/ia64/bin/ed/Makefile#7 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.25 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES WARNS= 2 ==== //depot/projects/ia64/contrib/isc-dhcp/includes/cf/freebsd.h#4 (text+ko) ==== @@ -40,7 +40,7 @@ * see ``http://www.vix.com''. To learn more about Nominum, Inc., see * ``http://www.nominum.com''. * - * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.5 2002/09/30 08:45:34 murray Exp $ + * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.6 2003/06/29 18:46:17 gordon Exp $ */ #include @@ -103,6 +103,10 @@ #define SOCKLEN_T int #endif +#ifdef RESCUE +#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" +#endif + #if defined (USE_DEFAULT_NETWORK) # define USE_BPF #endif @@ -113,6 +117,9 @@ #endif /* HAVE_DEV_RANDOM */ const char *cmds[] = { +#ifndef RESCUE + /* rescue environment can't rely on these ... */ + /* Actually, /sbin/dhclient shouldn't use these, either. */ "/bin/ps -axlw 2>&1", "/usr/sbin/arp -an 2>&1", "/usr/bin/netstat -an 2>&1", @@ -123,10 +130,12 @@ "/usr/sbin/iostat 2>&1", "/usr/bin/vmstat 2>&1", "/usr/bin/w 2>&1", +#endif NULL }; const char *dirs[] = { +#ifndef RESCUE "/tmp", "/usr/tmp", ".", @@ -136,13 +145,16 @@ "/var/mail", "/home", "/usr/home", +#endif NULL }; const char *files[] = { +#ifndef RESCUE "/var/log/messages", "/var/log/wtmp", "/var/log/lastlog", +#endif NULL }; #endif /* NEED_PRAND_CONF */ ==== //depot/projects/ia64/etc/mtree/BSD.root.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.62 2003/03/11 11:14:34 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.63 2003/06/29 18:35:36 gordon Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -63,6 +63,8 @@ .. proc mode=0555 .. + rescue + .. root .. sbin ==== //depot/projects/ia64/etc/rc.d/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.20 2003/06/29 05:15:57 mtm Exp $ .include @@ -12,10 +12,10 @@ ldconfig local localdaemons lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ - named netif network1 network2 network3 \ + named netif netoptions network1 network2 network3 \ network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ - rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ + rarpd rcconf.sh root route6d routed routing rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ syslogd timed ttys usbd vinum virecover watchdogd ypbind \ yppasswdd ypserv ypset ypupdated ypxfrd ==== //depot/projects/ia64/etc/rc.d/NETWORKING#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.5 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.6 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: network dhclient altqd netif network2 network_ipv6 isdnd ppp-user +# REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user # REQUIRE: routed mrouted route6d mroute6d # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/etc/rc.d/atm2.sh#5 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm2.sh,v 1.12 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/atm2.sh,v 1.13 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: atm2 # REQUIRE: atm1 netif -# BEFORE: network2 +# BEFORE: routing # KEYWORD: FreeBSD # ==== //depot/projects/ia64/etc/rc.d/dhclient#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.5 2003/06/07 10:31:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.6 2003/06/29 05:34:41 mtm Exp $ # # PROVIDE: dhclient @@ -23,6 +23,9 @@ rcvar= start_precmd="dhclient_prestart" start_postcmd="dhclient_poststart" + stop_cmd="dhclient_stop" + stop_precmd="dhclient_prestop" + stop_postcmd="dhclient_poststop" ;; NetBSD) rcvar=$name @@ -30,29 +33,81 @@ ;; esac -dhclient_prestart() +dhclient_common() { dhcp_list="`list_net_interfaces dhcp`" if [ -z "$dhcp_list" ]; then return 1 fi - for ifn in ${dhcp_list}; do + # Determine the scope of the command + # + _cooked_list="$dhcp_list" + if [ -n "$_cmdifn" ]; then + eval _cooked_list=\"`expr "$dhcp_list" : ".*\($_cmdifn\).*"`\" + if [ -z "$_cooked_list" ]; then + err "No such network interface: $_cmdifn" + return 1 + fi + fi +} + +dhclient_prestart() +{ + dhclient_common || return 1 + + for ifn in ${_cooked_list}; do ifscript_up ${ifn} done - rc_flags="${rc_flags} ${dhcp_list}" + rc_flags="${rc_flags} ${_cooked_list}" return 0 } dhclient_poststart() { - for ifn in ${dhcp_list}; do + for ifn in ${_cooked_list}; do ifalias_up ${ifn} ipx_up ${ifn} ifconfig ${ifn} done } +dhclient_stop() +{ + echo -n "Releasing DHCP leases:" + for ifn in $_cooked_list ; do + ${command} -r $ifn + if [ $? -eq 0 ]; then + echo -n " $ifn" + else + _fail="$_fail $ifn" + fi + done + echo '.' + debug "The following leases failed to release: $_fail" +} + +dhclient_prestop() +{ + dhclient_common || return 1 + + for ifn in ${_cooked_list}; do + ipx_down ${ifn} + ifalias_down ${ifn} + done +} + +dhclient_poststop() +{ + for ifn in ${_cooked_list}; do + ifscript_down ${ifn} + done +} + +if [ -n "$2" ]; then + _cmdifn="$2" +fi + load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/ip6fw#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.3 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: ip6fw -# REQUIRE: network2 +# REQUIRE: routing # BEFORE: network_ipv6 # KEYWORD: FreeBSD ==== //depot/projects/ia64/etc/rc.d/mrouted#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.4 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.5 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: mrouted -# REQUIRE: netif network2 +# REQUIRE: netif routing # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/netif#2 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.1 2003/04/18 17:51:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.2 2003/06/29 05:34:41 mtm Exp $ # # PROVIDE: netif @@ -38,52 +38,129 @@ cloneup_cmd="clone_up" clonedown_cmd="clone_down" extra_commands="cloneup clonedown" +_cmdifn= network_start() { - # Create cloned interfaces - clone_up + if [ -z "$_cmdifn" ]; then + # + # We're operating as a general network start routine. + # + + # Create cloned interfaces + clone_up + + # Create IPv6<-->IPv4 tunnels + gif_up + fi + + # Configure the interface(s). + network_common ifn_start verbose + + # Resync ipfilter + /etc/rc.d/ipfilter resync +} + +network_stop() +{ + echo -n "Stopping network:" + + # Deconfigure the interface(s) + network_common ifn_stop + echo '.' +} + +# network_common routine verbose +# Common configuration subroutine for network interfaces. This +# routine takes all the preparatory steps needed for configuriing +# an interface and then calls $routine. If $verbose is specified, +# it will call ifconfig(8) to show, in long format, the configured +# interfaces. If $verbose is not given, it will simply output the +# configured interface(s). +network_common() +{ + _func= + _verbose= - # Create IPv6<-->IPv4 tunnels - gif_up + if [ -z "$1" ]; then + err "network_common(): No function name specified." + else + _func="$1" + fi + [ -n "$2" ] && _verbose=yes # Get a list of network interfaces. Do not include dhcp interfaces. _ifn_list="`list_net_interfaces nodhcp`" - # Setup the supplied network interfaces including startup - # scripts, if they exist. + # Set the scope of the command (all interfaces or just one). # - for ifn in ${_ifn_list}; do - ifscript_up ${ifn} && eval showstat_$ifn=1 + _cooked_list="$_ifn_list" + if [ -n "$_cmdifn" ]; then + eval _cooked_list=\"`expr "$_ifn_list" : ".*\($_cmdifn\).*"`\" + if [ -z "$_cooked_list" ]; then + err "No such network interface: $_cmdifn" + return 1 + fi + fi - ifconfig_up ${ifn} && eval showstat_$ifn=1 - - ifalias_up ${ifn} && eval showstat_$ifn=1 - - ipx_up ${ifn} && eval showstat_$ifn=1 + for ifn in ${_cooked_list}; do + if ${_func} ${ifn} ; then + eval showstat_$ifn=1 + else + _fail="$_fail $ifn" + fi done # Display interfaces configured by this script # - for ifn in ${_ifn_list}; do + for ifn in ${_cooked_list}; do eval showstat=\$showstat_${ifn} if [ ! -z ${showstat} ]; then - ifconfig ${ifn} + if [ -n "$_verbose" ]; then + ifconfig ${ifn} + else + echo -n " ${ifn}" + fi fi done + debug "The following interfaces were not configured: $_fail" +} - # Resync ipfilter - /etc/rc.d/ipfilter resync +ifn_start() +{ + local ifn cfg + ifn="$1" + cfg=1 + + [ -z "$ifn" ] && return 1 + + ifscript_up ${ifn} && cfg=0 + ifconfig_up ${ifn} && cfg=0 + ifalias_up ${ifn} && cfg=0 + ipx_up ${ifn} && cfg=0 + + return $cfg } -network_stop() +ifn_stop() { - echo -n "Stopping network:" + local ifn cfg + ifn="$1" + cfg=1 + + [ -z "$ifn" ] && return 1 + + ipx_down ${ifn} && cfg=0 + ifalias_down ${ifn} && cfg=0 + ifconfig_down ${ifn} && cfg=0 + ifscript_down ${ifn} && cfg=0 - # flush routes - route -n flush - echo '.' + return $cfg } +if [ -n "$2" ]; then + _cmdifn="$2" +fi + load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/netoptions#2 (text+ko) ==== @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.137 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.138 2003/06/29 05:09:48 mtm Exp $ # -# PROVIDE: network3 +# PROVIDE: netoptions # REQUIRE: localdaemons # BEFORE: securelevel # KEYWORD: FreeBSD ==== //depot/projects/ia64/etc/rc.d/network2#4 (text+ko) ==== @@ -2,12 +2,12 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/network2,v 1.136 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/network2,v 1.137 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: network2 # REQUIRE: netif ppp-user -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nostart . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/network3#5 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.138 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nostart . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/network_ipv6#6 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.34 2003/05/12 11:36:50 ume Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.35 2003/06/29 05:15:57 mtm Exp $ # From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43 # # PROVIDE: network_ipv6 -# REQUIRE: network2 +# REQUIRE: routing # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/routed#6 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.5 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.6 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: routed -# REQUIRE: netif network2 +# REQUIRE: netif routing # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/routing#2 (text+ko) ==== @@ -2,20 +2,34 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.136 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.138 2003/06/29 17:59:09 mtm Exp $ # -# PROVIDE: network2 +# PROVIDE: routing # REQUIRE: netif ppp-user # KEYWORD: FreeBSD . /etc/rc.subr -name="network2" -start_cmd="network2_start" -stop_cmd=":" +name="routing" +start_cmd="routing_start" +stop_cmd="routing_stop" +extra_commands="options static" +static_cmd="static_start" +options_cmd="options_start" + +routing_start() +{ + static_start + options_start +} + +routing_stop() +{ + route -n flush +} -network2_start() +static_start() { case ${defaultrouter} in [Nn][Oo] | '') @@ -34,7 +48,10 @@ route add ${route_args} done fi +} +options_start() +{ echo -n 'Additional routing options:' case ${tcp_extensions} in [Yy][Ee][Ss] | '') ==== //depot/projects/ia64/include/paths.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.21 2003/06/25 22:28:33 phantom Exp $ + * $FreeBSD: src/include/paths.h,v 1.24 2003/06/29 18:35:36 gordon Exp $ */ #ifndef _PATHS_H_ @@ -44,6 +44,9 @@ /* All standard utilities path. */ #define _PATH_STDPATH \ "/usr/bin:/bin:/usr/sbin:/sbin:" +/* Locate system binaries */ +#define _PATH_SYSPATH \ + "/sbin:/usr/sbin" #define _PATH_AUTHCONF "/etc/auth.conf" #define _PATH_BSHELL "/bin/sh" @@ -66,7 +69,10 @@ #define _PATH_LOGIN "/usr/bin/login" #define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/share/man" +#define _PATH_MDCONFIG "/sbin/mdconfig" #define _PATH_MEM "/dev/mem" +#define _PATH_MOUNT "/sbin/mount" +#define _PATH_NEWFS "/sbin/newfs" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" #define _PATH_REBOOT "/sbin/reboot" @@ -94,4 +100,39 @@ const char *getbootfile(void); __END_DECLS +#ifdef RESCUE +#undef _PATH_DEFPATH +#define _PATH_DEFPATH "/rescue:/usr/bin:/bin" +#undef _PATH_STDPATH +#define _PATH_STDPATH "/rescue:/usr/bin:/bin:/usr/sbin:/sbin" +#undef _PATH_SYSPATH +#define _PATH_SYSPATH "/rescue:/sbin:/usr/sbin" +#undef _PATH_BSHELL +#define _PATH_BSHELL "/rescue/sh" +#undef _PATH_CP +#define _PATH_CP "/rescue/cp" +#undef _PATH_CSHELL +#define _PATH_CSHELL "/rescue/csh" +#undef _PATH_HALT +#define _PATH_HALT "/rescue/halt" +#undef _PATH_IFCONFIG +#define _PATH_IFCONFIG "/rescue/ifconfig" +#undef _PATH_MDCONFIG +#define _PATH_MDCONFIG "/rescue/mdconfig" +#undef _PATH_MOUNT +#define _PATH_MOUNT "/rescue/mount" +#undef _PATH_NEWFS +#define _PATH_NEWFS "/rescue/newfs" +#undef _PATH_RCP +#define _PATH_RCP "/rescue/rcp" +#undef _PATH_REBOOT +#define _PATH_REBOOT "/rescue/reboot" +#undef _PATH_RM +#define _PATH_RM "/rescue/rm" +#undef _PATH_VI +#define _PATH_VI "/rescue/vi" +#undef _PATH_WALL +#define _PATH_WALL "/rescue/wall" +#endif /* RESCUE */ + #endif /* !_PATHS_H_ */ ==== //depot/projects/ia64/include/unistd.h#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.66 2002/12/29 01:07:55 mike Exp $ + * $FreeBSD: src/include/unistd.h,v 1.67 2003/06/29 17:33:34 gordon Exp $ */ #ifndef _UNISTD_H_ @@ -335,6 +335,7 @@ int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); +int execvP(const char *, const char *, char * const *); pid_t fork(void); long fpathconf(int, int); char *getcwd(char *, size_t); ==== //depot/projects/ia64/lib/libc/gen/exec.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 -.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.20 2003/06/18 15:24:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.21 2003/06/29 17:33:34 gordon Exp $ .\" .Dd January 24, 1994 .Dt EXEC 3 @@ -41,7 +41,8 @@ .Nm execle , .Nm exect , .Nm execv , -.Nm execvp +.Nm execvp , +.Nm execvP .Nd execute a file .Sh LIBRARY .Lb libc @@ -60,6 +61,8 @@ .Fn execv "const char *path" "char *const argv[]" .Ft int .Fn execvp "const char *file" "char *const argv[]" +.Ft int +.Fn execvP "const char *file" "const char *search_path" "char *const argv[]" .Sh DESCRIPTION The .Nm exec @@ -99,8 +102,9 @@ The .Fn exect , .Fn execv , +.Fn execvp , and -.Fn execvp +.Fn execvP functions provide an array of pointers to null-terminated strings that represent the argument list available to the new program. The first argument, by convention, should point to the file name associated @@ -134,14 +138,19 @@ Some of these functions have special semantics. .Pp The functions -.Fn execlp +.Fn execlp , +.Fn execvp , and -.Fn execvp +.Fn execvP will duplicate the actions of the shell in searching for an executable file if the specified file name does not contain a slash .Dq Li / character. -The search path is the path specified in the environment by +For +.Fn execlp +and +.Fn execvp , +search path is the path specified in the environment by .Dq Ev PATH variable. If this variable isn't specified, @@ -151,6 +160,9 @@ .Aq paths.h , which is set to .Dq Ev /usr/bin:/bin . +For +.Fn execvP , +the search path is specified as an argument to the function. In addition, certain errors are treated specially. .Pp If an error is ambiguous (for simplicity, we shall consider all @@ -206,9 +218,10 @@ The .Fn execl , .Fn execle , -.Fn execlp +.Fn execlp , +.Fn execvp and -.Fn execvp +.Fn execvP functions may fail and set .Va errno @@ -300,3 +313,7 @@ functions conform to .St -p1003.1-88 . +The +.Fn execvP +function first appeared in +.Fx 5.2 . ==== //depot/projects/ia64/lib/libc/gen/exec.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.20 2003/01/03 23:16:55 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.21 2003/06/29 17:33:34 gordon Exp $"); #include "namespace.h" #include @@ -142,15 +142,27 @@ } int -execvp(name, argv) +execvp(const char *name, char *const *argv) +{ + const char *path; + + /* Get the path we're searching. */ + if (!(path = getenv("PATH"))) + path = _PATH_DEFPATH; + return(execvP(name,path,argv)); +} + +int +execvP(name, path, argv) const char *name; + const char *path; char * const *argv; { char **memp; int cnt, lp, ln; char *p; int eacces, save_errno; - char *bp, *cur, *path, buf[MAXPATHLEN]; + char *bp, *cur, buf[MAXPATHLEN]; struct stat sb; eacces = 0; @@ -158,7 +170,7 @@ /* If it's an absolute or relative path name, it's easy. */ if (index(name, '/')) { bp = (char *)name; - cur = path = NULL; + cur = NULL; goto retry; } bp = buf; @@ -169,16 +181,12 @@ return (-1); } - /* Get the path we're searching. */ - if (!(path = getenv("PATH"))) - path = _PATH_DEFPATH; cur = alloca(strlen(path) + 1); if (cur == NULL) { errno = ENOMEM; return (-1); } strcpy(cur, path); - path = cur; while ( (p = strsep(&cur, ":")) ) { /* * It's a SHELL path -- double, leading and trailing colons @@ -197,7 +205,7 @@ * the user may execute the wrong program. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 29 13:11:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBD2137B404; Sun, 29 Jun 2003 13:11:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 715FC37B401 for ; Sun, 29 Jun 2003 13:11:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED3BB43FF5 for ; Sun, 29 Jun 2003 13:11:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TKBF0U055071 for ; Sun, 29 Jun 2003 13:11:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TKBFn1055065 for perforce@freebsd.org; Sun, 29 Jun 2003 13:11:15 -0700 (PDT) Date: Sun, 29 Jun 2003 13:11:15 -0700 (PDT) Message-Id: <200306292011.h5TKBFn1055065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 20:11:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=33852 Change 33852 by marcel@marcel_nfs on 2003/06/29 13:11:04 IFC @33848 Affected files ... .. //depot/projects/uart/alpha/alpha/support.s#2 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#2 integrate .. //depot/projects/uart/pci/if_rl.c#2 integrate .. //depot/projects/uart/sys/param.h#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/support.s#2 (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/alpha/alpha/support.s,v 1.13 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.14 2003/06/29 17:14:42 marcel Exp $ */ /* @@ -84,7 +84,27 @@ mov zero, v0 RET END(suword) - + + LEAF(suword32, 2) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + stq t0, PCB_ONFAULT(t2) + + stl a1, 0(a0) /* try the store */ + + stq zero, PCB_ONFAULT(t2) /* clean up */ + + mov zero, v0 + RET + END(suword32) + LEAF(subyte, 1) LDGP(pv) @@ -130,6 +150,25 @@ RET END(fuword) + LEAF(fuword32, 1) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + stq t0, PCB_ONFAULT(t2) + + ldl v0, 0(a0) /* get the word containing our byte */ + + stq zero, PCB_ONFAULT(t2) /* clean up */ + + RET + END(fuword32) + LEAF(fubyte, 1) LDGP(pv) ==== //depot/projects/uart/ia64/ia64/pmap.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.111 2003/06/18 02:57:38 alc Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.112 2003/06/29 06:10:32 alc Exp $ */ /* @@ -1762,7 +1762,6 @@ vm_object_t object, vm_pindex_t pindex, vm_size_t size, int limit) { - pmap_t oldpmap; vm_offset_t tmpidx; int psize; vm_page_t p; @@ -1770,21 +1769,18 @@ if (pmap == NULL || object == NULL) return; - - oldpmap = pmap_install(pmap); - + VM_OBJECT_LOCK(object); psize = ia64_btop(size); if ((object->type != OBJT_VNODE) || ((limit & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) && (object->resident_page_count > MAX_INIT_PT))) { - pmap_install(oldpmap); - return; + goto unlock_return; } if (psize + pindex > object->size) { if (object->size < pindex) - return; + goto unlock_return; psize = object->size - pindex; } @@ -1823,8 +1819,10 @@ vm_page_deactivate(p); vm_page_busy(p); vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, addr + ia64_ptob(tmpidx), p); + VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); } @@ -1855,16 +1853,18 @@ vm_page_deactivate(p); vm_page_busy(p); vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, addr + ia64_ptob(tmpidx), p); + VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); } vm_page_unlock_queues(); } } - pmap_install(oldpmap); - return; +unlock_return: + VM_OBJECT_UNLOCK(object); } /* ==== //depot/projects/uart/pci/if_rl.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.100 2003/06/11 06:24:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.101 2003/06/29 17:33:33 wpaul Exp $"); #include #include @@ -133,7 +133,7 @@ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.100 2003/06/11 06:24:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.101 2003/06/29 17:33:33 wpaul Exp $"); /* * Various supported device vendors/types and their names. @@ -1597,7 +1597,6 @@ struct rl_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; struct mii_data *mii; - int i; u_int32_t rxcfg = 0; RL_LOCK(sc); @@ -1608,10 +1607,15 @@ */ rl_stop(sc); - /* Init our MAC address */ - for (i = 0; i < ETHER_ADDR_LEN; i++) { - CSR_WRITE_1(sc, RL_IDR0 + i, sc->arpcom.ac_enaddr[i]); - } + /* + * Init our MAC address. Even though the chipset + * documentation doesn't mention it, we need to enter "Config + * register write enable" mode to modify the ID registers. + */ + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_WRITECFG); + CSR_WRITE_4(sc, RL_IDR0, *(u_int32_t *)(&sc->arpcom.ac_enaddr[0])); + CSR_WRITE_4(sc, RL_IDR4, *(u_int32_t *)(&sc->arpcom.ac_enaddr[4])); + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); /* Init the RX buffer pointer register. */ bus_dmamap_load(sc->rl_tag, sc->rl_cdata.rl_rx_dmamap, ==== //depot/projects/uart/sys/param.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.160 2003/06/12 04:44:15 imp Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.161 2003/06/29 15:51:38 jdp Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * scheme is: <0 if release branch, otherwise 1>xx */ #undef __FreeBSD_version -#define __FreeBSD_version 501100 /* Master, propagated to newvers */ +#define __FreeBSD_version 501101 /* Master, propagated to newvers */ #ifndef NULL #define NULL 0 From owner-p4-projects@FreeBSD.ORG Sun Jun 29 14:35:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 001A037B404; Sun, 29 Jun 2003 14:35:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C62937B401 for ; Sun, 29 Jun 2003 14:35:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033743FA3 for ; Sun, 29 Jun 2003 14:34:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TLYx0U082316 for ; Sun, 29 Jun 2003 14:34:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TLYxar082313 for perforce@freebsd.org; Sun, 29 Jun 2003 14:34:59 -0700 (PDT) Date: Sun, 29 Jun 2003 14:34:59 -0700 (PDT) Message-Id: <200306292134.h5TLYxar082313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 21:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=33856 Change 33856 by marcel@marcel_nfs on 2003/06/29 14:34:48 Add alpha specific global option NO_SIO to allow building a kernel without sio(4). The option removes all sio(4) related code from the model specific initialization and introduces a regular call to cninit() in machdep.c Affected files ... .. //depot/projects/uart/alpha/alpha/api_up1000.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_1000a.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_eb164.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_kn300.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_st550.c#2 edit .. //depot/projects/uart/alpha/alpha/dec_st6600.c#2 edit .. //depot/projects/uart/alpha/alpha/machdep.c#2 edit .. //depot/projects/uart/conf/options.alpha#2 edit Differences ... ==== //depot/projects/uart/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -48,18 +48,21 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif + +extern int sccnattach(void); void api_up1000_init(void); static void api_up1000_cons_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void api_up1000_init() { @@ -74,38 +77,38 @@ platform.cons_init = api_up1000_cons_init; } -extern int comconsole; - static void api_up1000_cons_init() { struct ctb *ctb; irongate_init(); + +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { - case 2: + case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -94,15 +94,21 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif + +extern int sccnattach(void); void dec_1000a_init(int); static void dec_1000a_cons_init(void); - static void dec_1000_intr_map(void *); static void dec_1000_intr_disable(int); static void dec_1000_intr_enable(int); @@ -113,11 +119,6 @@ static void dec_1000a_intr_enable(int); static void dec_1000a_intr_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - - static const struct alpha_variation_table dec_1000_variations[] = { { 0, "AlphaServer 1000" }, { 0, NULL }, @@ -172,8 +173,6 @@ } -/* XXX for forcing comconsole when srm serial console is used */ -extern int comconsole; static void dec_1000a_cons_init() @@ -186,35 +185,36 @@ apecs_init(); } +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)). + */ + DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Force a comconsole on com1 if the SRM has a serial + * console. + */ + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -52,22 +52,23 @@ #include #include "opt_dev_sc.h" + +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif + +extern int sccnattach(void); void dec_2100_a50_init(void); static void dec_2100_a50_cons_init(void); static void dec_2100_a50_intr_map(void *); -void sio_intr_establish(int); -void sio_intr_disestablish(int); -void sio_intr_setup(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, { SV_ST_MUSTANG2_4_166, "AlphaStation 200 4/166 (\"Mustang II\")" }, @@ -101,9 +102,6 @@ platform.pci_intr_map = dec_2100_a50_intr_map; } -/* XXX for forcing comconsole when srm serial console is used */ -extern int comconsole; - static void dec_2100_a50_cons_init() { @@ -111,32 +109,34 @@ apecs_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 9600); #endif +#endif + ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)). + */ + DELAY(160000000 / comcnrate); + /* + * Force a comconsole on com1 if the SRM has a serial console. + */ + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_2100_a500.c#2 (text+ko) ==== @@ -45,19 +45,23 @@ #include #include "opt_dev_sc.h" + +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif + +extern int sccnattach(void); void dec_2100_a500_init(int); static void dec_2100_a500_cons_init(void); static void dec_2100_a500_intr_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void dec_2100_a500_init(int cputype) { @@ -89,8 +93,6 @@ t2_init(); } -/* XXX for forcing comconsole when srm serial console is used */ -extern int comconsole; static void dec_2100_a500_cons_init() @@ -98,15 +100,18 @@ struct ctb *ctb; t2_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 9600); #endif +#endif + ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ /* * Delay to allow PROM putchars to complete. * FIFO depth * character time, @@ -121,6 +126,7 @@ panic("can't init serial console"); boothowto |= RB_SERIAL; +#endif break; case 3: ==== //depot/projects/uart/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -49,19 +49,23 @@ #include #include "opt_dev_sc.h" + +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif +extern int sccnattach(void); + void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); static int dec_axppci_33_intr_route (device_t, device_t, int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, { 0, NULL }, @@ -112,8 +116,6 @@ outb(NSIO_PORT + NSIO_DATA, cfg0val); } -/* XXX for forcing comconsole when srm serial console is used */ -extern int comconsole; static void dec_axppci_33_cons_init() @@ -122,32 +124,34 @@ lca_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 9600); #endif +#endif + ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); + /* + * force a comconsole on com1 if the SRM has a serial console + */ + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -48,10 +48,17 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif + +extern int sccnattach(void); void dec_eb164_init(void); static void dec_eb164_cons_init(void); @@ -61,10 +68,6 @@ extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void dec_eb164_init() { @@ -88,7 +91,6 @@ } } -extern int comconsole; /* XXX for forcing comconsole when srm serial console is used */ static void dec_eb164_cons_init() { @@ -96,35 +98,36 @@ cia_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Force a comconsole on com1 if the SRM has a serial + * console. + */ + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -68,10 +68,16 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +#endif + +extern int sccnattach(void); void dec_eb64plus_init(void); static void dec_eb64plus_cons_init(void); @@ -83,9 +89,6 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach(int, int); -extern int sccnattach(void); - const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64-plus" }, { 0, NULL }, @@ -116,8 +119,6 @@ } -/* XXX for forcing comconsole when srm serial console is used */ -extern int comconsole; /* init the console, serial or graphics */ static void @@ -131,27 +132,26 @@ switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * force a comconsole on com1 if the SRM has a serial + * console. + */ + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: #ifdef DEV_SC ==== //depot/projects/uart/alpha/alpha/dec_kn20aa.c#2 (text+ko) ==== @@ -50,11 +50,18 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif +extern int sccnattach(void); + void dec_kn20aa_init(void); static void dec_kn20aa_cons_init(void); static void dec_kn20aa_intr_init(void); @@ -62,10 +69,6 @@ static void dec_kn20aa_intr_disable(int); static void dec_kn20aa_intr_enable(int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - #if 0 static void dec_kn20aa_device_register(struct device *, void *); #endif @@ -74,7 +77,6 @@ { 0, "AlphaStation 500 or 600 (KN20AA)" }, { 0, NULL }, }; -extern int comconsole; /* XXX for forcing comconsole when srm serial console is used */ void dec_kn20aa_init() @@ -105,29 +107,31 @@ cia_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 9600); #endif +#endif + ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/dec_kn300.c#2 (text+ko) ==== @@ -58,11 +58,18 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif +extern int sccnattach(void); + void dec_kn300_init(void); void dec_kn300_cons_init(void); @@ -74,10 +81,6 @@ }; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void dec_kn300_init() { @@ -96,22 +99,24 @@ platform.cons_init = dec_kn300_cons_init; } -extern int comconsole; - void dec_kn300_cons_init() { struct ctb *ctb; mcbus_init(); + +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ /* * Delay to allow PROM putchars to complete. @@ -124,6 +129,7 @@ panic("can't init serial console"); boothowto |= RB_SERIAL; +#endif break; case 3: ==== //depot/projects/uart/alpha/alpha/dec_st550.c#2 (text+ko) ==== @@ -56,11 +56,18 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif +extern int sccnattach(void); + void st550_init(void); static void st550_cons_init(void); static void st550_intr_init(void); @@ -72,10 +79,6 @@ #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void st550_init() { @@ -95,8 +98,6 @@ platform.pci_intr_enable = st550_intr_enable; } -extern int comconsole; - static void st550_cons_init() { @@ -104,14 +105,17 @@ cia_init(); +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ /* XXX */ /* @@ -125,6 +129,7 @@ panic("can't init serial console"); boothowto |= RB_SERIAL; +#endif break; case 3: ==== //depot/projects/uart/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -47,11 +47,18 @@ #include "opt_dev_sc.h" +#ifndef NO_SIO #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED #endif static int comcnrate = CONSPEED; +extern int comconsole; +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +#endif +extern int sccnattach(void); + void st6600_init(void); static void st6600_cons_init(void); static void st6600_intr_init(void); @@ -59,10 +66,6 @@ #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -extern int sccnattach(void); - void st6600_init() { @@ -78,38 +81,38 @@ platform.pci_intr_init = st6600_intr_init; } -extern int comconsole; - static void st6600_cons_init() { struct ctb *ctb; tsunami_init(); + +#ifndef NO_SIO #ifdef DDB siogdbattach(0x2f8, 57600); #endif +#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: +#ifndef NO_SIO /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); + /* + * Delay to allow PROM putchars to complete. + * FIFO depth * character time, + * character time = (1000000 / (defaultrate / 10)) + */ + DELAY(160000000 / comcnrate); + comconsole = 0; + if (siocnattach(0x3f8, comcnrate)) + panic("can't init serial console"); - boothowto |= RB_SERIAL; - break; - } + boothowto |= RB_SERIAL; +#endif + break; case 3: /* display console ... */ ==== //depot/projects/uart/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -121,6 +121,7 @@ #include #include #include +#include #include #include #include @@ -581,10 +582,18 @@ * Initalize the real console, so the the bootstrap console is * no longer necessary. */ +#ifndef NO_SIO if (platform.cons_init) { platform.cons_init(); promcndetach(); } +#else + if (platform.cons_init) + platform.cons_init(); + promcndetach(); + cninit(); +#endif + /* NO MORE FIRMWARE ACCESS ALLOWED */ #ifdef _PMAP_MAY_USE_PROM_CONSOLE /* ==== //depot/projects/uart/conf/options.alpha#2 (text+ko) ==== @@ -16,6 +16,8 @@ DEC_1000A opt_cpu.h API_UP1000 opt_cpu.h +NO_SIO opt_global.h + MAXMEM PPC_PROBE_CHIPSET opt_ppc.h From owner-p4-projects@FreeBSD.ORG Sun Jun 29 16:27:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDF7437B404; Sun, 29 Jun 2003 16:27:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 610CE37B401 for ; Sun, 29 Jun 2003 16:27:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6A9C43FE5 for ; Sun, 29 Jun 2003 16:27:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TNRF0U017420 for ; Sun, 29 Jun 2003 16:27:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TNRF2P017417 for perforce@freebsd.org; Sun, 29 Jun 2003 16:27:15 -0700 (PDT) Date: Sun, 29 Jun 2003 16:27:15 -0700 (PDT) Message-Id: <200306292327.h5TNRF2P017417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 23:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=33858 Change 33858 by marcel@marcel_nfs on 2003/06/29 16:26:55 Add a bus front-end for ebus to puc(4). This allows us to use puc(4) to attach to dual channel UARTs like the Siemens SAB 82532. Since puc_devices is specific to the PIC front-end, keep it out of puc.c. Also, handle non-static puc_device_descriptions by copying the information to the softc instead of having a pointer there. This is experimental. Affected files ... .. //depot/projects/uart/conf/files#3 edit .. //depot/projects/uart/dev/puc/puc.c#2 edit .. //depot/projects/uart/dev/puc/puc_ebus.c#1 add .. //depot/projects/uart/dev/puc/puc_pci.c#2 edit .. //depot/projects/uart/dev/puc/pucdata.c#2 edit .. //depot/projects/uart/dev/puc/pucvar.h#2 edit Differences ... ==== //depot/projects/uart/conf/files#3 (text+ko) ==== @@ -578,6 +578,7 @@ dev/pst/pst-iop.c optional pst dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc +dev/puc/puc_ebus.c optional puc ebus dev/puc/puc_pci.c optional puc pci dev/puc/puc_pccard.c optional puc pccard dev/puc/pucdata.c optional puc pci ==== //depot/projects/uart/dev/puc/puc.c#2 (text+ko) ==== @@ -136,18 +136,18 @@ u_char t1, t2; int i; - switch (sc->sc_desc->ilr_type) { + switch (sc->sc_desc.ilr_type) { case PUC_ILR_TYPE_DIGI: sc->ilr_st = rman_get_bustag(res); sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2 && sc->sc_desc->ilr_offset[i] != 0; i++) { + for (i = 0; i < 2 && sc->sc_desc.ilr_offset[i] != 0; i++) { t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); t1 = ~t1; bus_space_write_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i], t1); + sc->sc_desc.ilr_offset[i], t1); t2 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); if (t2 == t1) return (0); } @@ -169,16 +169,17 @@ struct resource *res; struct resource_list_entry *rle; + if (desc == NULL) + return (ENXIO); + sc = (struct puc_softc *)device_get_softc(dev); bzero(sc, sizeof(*sc)); - sc->sc_desc = desc; - if (sc->sc_desc == NULL) - return (ENXIO); + sc->sc_desc = *desc; #ifdef PUC_DEBUG bootverbose = 1; - printf("puc: name: %s\n", sc->sc_desc->name); + printf("puc: name: %s\n", sc->sc_desc.name); #endif rid = 0; res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, @@ -205,15 +206,15 @@ rid = 0; for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (i > 0 && rid == sc->sc_desc->ports[i].bar) + if (i > 0 && rid == sc->sc_desc.ports[i].bar) sc->barmuxed = 1; - rid = sc->sc_desc->ports[i].bar; + rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); if (sc->sc_bar_mappings[bidx].res != NULL) continue; - type = (sc->sc_desc->ports[i].flags & PUC_FLAGS_MEMORY) + type = (sc->sc_desc.ports[i].flags & PUC_FLAGS_MEMORY) ? SYS_RES_MEMORY : SYS_RES_IOPORT; res = bus_alloc_resource(dev, type, &rid, 0ul, ~0ul, 1, @@ -225,7 +226,7 @@ sc->sc_bar_mappings[bidx].type = type; sc->sc_bar_mappings[bidx].res = res; - if (sc->sc_desc->ilr_type != PUC_ILR_TYPE_NONE) { + if (sc->sc_desc.ilr_type != PUC_ILR_TYPE_NONE) { sc->ilr_enabled = puc_probe_ilr(sc, res); if (sc->ilr_enabled) device_printf(dev, "ILR enabled\n"); @@ -247,12 +248,12 @@ } for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - rid = sc->sc_desc->ports[i].bar; + rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); if (sc->sc_bar_mappings[bidx].res == NULL) continue; - switch (sc->sc_desc->ports[i].type) { + switch (sc->sc_desc.ports[i].type) { case PUC_PORT_TYPE_COM: typestr = "sio"; break; @@ -276,8 +277,8 @@ res = sc->sc_bar_mappings[bidx].res; type = sc->sc_bar_mappings[bidx].type; resource_list_add(&pdev->resources, type, 0, - rman_get_start(res) + sc->sc_desc->ports[i].offset, - rman_get_start(res) + sc->sc_desc->ports[i].offset + 8 - 1, + rman_get_start(res) + sc->sc_desc.ports[i].offset, + rman_get_start(res) + sc->sc_desc.ports[i].offset + 8 - 1, 8); rle = resource_list_find(&pdev->resources, type, 0); @@ -292,16 +293,16 @@ } rle->res->r_start = rman_get_start(res) + - sc->sc_desc->ports[i].offset; + sc->sc_desc.ports[i].offset; rle->res->r_end = rle->res->r_start + 8 - 1; rle->res->r_bustag = rman_get_bustag(res); bus_space_subregion(rle->res->r_bustag, rman_get_bushandle(res), - sc->sc_desc->ports[i].offset, 8, + sc->sc_desc.ports[i].offset, 8, &rle->res->r_bushandle); } - pdev->serialfreq = sc->sc_desc->ports[i].serialfreq; + pdev->serialfreq = sc->sc_desc.ports[i].serialfreq; childunit = puc_find_free_unit(typestr); sc->sc_ports[i].dev = device_add_child(dev, typestr, childunit); @@ -315,18 +316,18 @@ continue; } device_set_ivars(sc->sc_ports[i].dev, pdev); - device_set_desc(sc->sc_ports[i].dev, sc->sc_desc->name); + device_set_desc(sc->sc_ports[i].dev, sc->sc_desc.name); if (!bootverbose) device_quiet(sc->sc_ports[i].dev); #ifdef PUC_DEBUG printf("puc: type %d, bar %x, offset %x\n", - sc->sc_desc->ports[i].type, - sc->sc_desc->ports[i].bar, - sc->sc_desc->ports[i].offset); + sc->sc_desc.ports[i].type, + sc->sc_desc.ports[i].bar, + sc->sc_desc.ports[i].offset); puc_print_resource_list(&pdev->resources); #endif device_set_flags(sc->sc_ports[i].dev, - sc->sc_desc->ports[i].flags); + sc->sc_desc.ports[i].flags); if (device_probe_and_attach(sc->sc_ports[i].dev) != 0) { if (sc->barmuxed) { bus_space_unmap(rman_get_bustag(rle->res), @@ -351,11 +352,11 @@ int i; mask = 0; - switch (sc->sc_desc->ilr_type) { + switch (sc->sc_desc.ilr_type) { case PUC_ILR_TYPE_DIGI: - for (i = 1; i >= 0 && sc->sc_desc->ilr_offset[i] != 0; i--) { + for (i = 1; i >= 0 && sc->sc_desc.ilr_offset[i] != 0; i--) { mask = (mask << 8) | (bus_space_read_1(sc->ilr_st, - sc->ilr_sh, sc->sc_desc->ilr_offset[i]) & 0xff); + sc->ilr_sh, sc->sc_desc.ilr_offset[i]) & 0xff); } break; @@ -388,28 +389,6 @@ (sc->sc_ports[i].ihand)(sc->sc_ports[i].ihandarg); } -const struct puc_device_description * -puc_find_description(uint32_t vend, uint32_t prod, uint32_t svend, - uint32_t sprod) -{ - int i; - -#define checkreg(val, index) \ - (((val) & puc_devices[i].rmask[(index)]) == puc_devices[i].rval[(index)]) - - for (i = 0; puc_devices[i].name != NULL; i++) { - if (checkreg(vend, PUC_REG_VEND) && - checkreg(prod, PUC_REG_PROD) && - checkreg(svend, PUC_REG_SVEND) && - checkreg(sprod, PUC_REG_SPROD)) - return (&puc_devices[i]); - } - -#undef checkreg - - return (NULL); -} - static int puc_find_free_unit(char *name) { ==== //depot/projects/uart/dev/puc/puc_pci.c#2 (text+ko) ==== @@ -79,6 +79,32 @@ #define PUC_ENTRAILS 1 #include +extern const struct puc_device_description puc_devices[]; + +int puc_config_win877(struct puc_softc *); + +static const struct puc_device_description * +puc_find_description(uint32_t vend, uint32_t prod, uint32_t svend, + uint32_t sprod) +{ + int i; + +#define checkreg(val, index) \ + (((val) & puc_devices[i].rmask[(index)]) == puc_devices[i].rval[(index)]) + + for (i = 0; puc_devices[i].name != NULL; i++) { + if (checkreg(vend, PUC_REG_VEND) && + checkreg(prod, PUC_REG_PROD) && + checkreg(svend, PUC_REG_SVEND) && + checkreg(sprod, PUC_REG_SPROD)) + return (&puc_devices[i]); + } + +#undef checkreg + + return (NULL); +} + static int puc_pci_probe(device_t dev) { ==== //depot/projects/uart/dev/puc/pucdata.c#2 (text+ko) ==== @@ -47,6 +47,8 @@ #define COM_FREQ DEFAULT_RCLK +int puc_config_win877(struct puc_softc *); + const struct puc_device_description puc_devices[] = { { "Comtrol RocketPort 550/4 RJ45", ==== //depot/projects/uart/dev/puc/pucvar.h#2 (text+ko) ==== @@ -93,6 +93,10 @@ #define PUC_PORT_TYPE_COM 1 #define PUC_PORT_TYPE_LPT 2 +/* UART subtypes. */ +#define PUC_PORT_COM_NS8250 (0<<8) +#define PUC_PORT_COM_SAB82532 (1<<8) + /* Interrupt Latch Register (ILR) types */ #define PUC_ILR_TYPE_NONE 0 #define PUC_ILR_TYPE_DIGI 1 @@ -100,12 +104,13 @@ #define PUC_FLAGS_MEMORY 0x0001 /* Use memory mapped I/O. */ #define PUC_PORT_VALID(desc, port) \ - ((port) < PUC_MAX_PORTS && (desc)->ports[(port)].type != PUC_PORT_TYPE_NONE) + ((port) < PUC_MAX_PORTS && (desc).ports[(port)].type != PUC_PORT_TYPE_NONE) #define PUC_MAX_BAR 6 enum puc_device_ivars { - PUC_IVAR_FREQ + PUC_IVAR_FREQ, + PUC_IVAR_SUBTYPE }; #ifdef PUC_ENTRAILS @@ -120,11 +125,9 @@ void (*)(void *), void *, void **); int puc_teardown_intr(device_t, device_t, struct resource *, void *); -const struct puc_device_description *puc_find_description(uint32_t, - uint32_t, uint32_t, uint32_t); struct puc_softc { - const struct puc_device_description *sc_desc; + struct puc_device_description sc_desc; /* card-global dynamic data */ int fastintr; @@ -153,6 +156,3 @@ }; #endif /* PUC_ENTRAILS */ - -int puc_config_win877(struct puc_softc *); -extern const struct puc_device_description puc_devices[]; From owner-p4-projects@FreeBSD.ORG Sun Jun 29 16:29:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A34F37B404; Sun, 29 Jun 2003 16:29:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 504FF37B401 for ; Sun, 29 Jun 2003 16:29:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECCE843F93 for ; Sun, 29 Jun 2003 16:29:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TNTI0U017540 for ; Sun, 29 Jun 2003 16:29:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TNTIfm017537 for perforce@freebsd.org; Sun, 29 Jun 2003 16:29:18 -0700 (PDT) Date: Sun, 29 Jun 2003 16:29:18 -0700 (PDT) Message-Id: <200306292329.h5TNTIfm017537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 23:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=33859 Change 33859 by marcel@marcel_nfs on 2003/06/29 16:28:24 We only know about a single channel. We expect to have 2 independent UART drivers attach to dual channel UARTs. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#2 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#2 (text+ko) ==== @@ -131,7 +131,7 @@ "sab82532 class", sab82532_methods, sizeof(struct sab82532_softc), - .uc_range = 128, + .uc_range = 64, .uc_rclk = 1843200 }; @@ -142,7 +142,7 @@ const char *ch, *vstr; /* Assume the address range is naturally aligned. */ - ch = ((sc->sc_bas.bsh & 0x7f) == 0) ? "A" : "B"; + ch = ((sc->sc_bas.bsh & 0x40) == 0) ? "A" : "B"; switch (uart_getreg(&sc->sc_bas, SAB_VSTR) & SAB_VSTR_VMASK) { case SAB_VSTR_V_1: vstr = "v1"; break; From owner-p4-projects@FreeBSD.ORG Sun Jun 29 16:32:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D1F037B404; Sun, 29 Jun 2003 16:32:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B588537B401 for ; Sun, 29 Jun 2003 16:32:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C0FB4402D for ; Sun, 29 Jun 2003 16:32:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5TNWN0U019010 for ; Sun, 29 Jun 2003 16:32:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5TNWMt1019004 for perforce@freebsd.org; Sun, 29 Jun 2003 16:32:22 -0700 (PDT) Date: Sun, 29 Jun 2003 16:32:22 -0700 (PDT) Message-Id: <200306292332.h5TNWMt1019004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 23:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=33860 Change 33860 by marcel@marcel_nfs on 2003/06/29 16:31:25 Attach with a lower priority to dual channel UARTs. This makes sure that puc(4) will attach if configured. This also means that if we attach, we will use the first channel only. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#2 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#2 (text+ko) ==== @@ -63,18 +63,21 @@ { const char *nm; struct uart_softc *sc; + int error; sc = device_get_softc(dev); sc->sc_class = NULL; nm = ebus_get_name(dev); - if (!strcmp(nm, "su")) + if (!strcmp(nm, "su")) { sc->sc_class = &uart_ns8250_class; - else if (!strcmp(nm, "se")) + return (uart_bus_probe(dev, 0, 0, 0)); + } + if (!strcmp(nm, "se")) { sc->sc_class = &uart_sab82532_class; - - if (sc->sc_class != NULL) - return (uart_bus_probe(dev, 0, 0, 0)); + error = uart_bus_probe(dev, 0, 0, 0); + return ((error) ? error : -1); + } return (ENXIO); } From owner-p4-projects@FreeBSD.ORG Sun Jun 29 19:01:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4447A37B404; Sun, 29 Jun 2003 19:01:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D87C037B401 for ; Sun, 29 Jun 2003 19:01:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 642A444015 for ; Sun, 29 Jun 2003 19:01:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U21R0U069786 for ; Sun, 29 Jun 2003 19:01:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U21QfZ069777 for perforce@freebsd.org; Sun, 29 Jun 2003 19:01:26 -0700 (PDT) Date: Sun, 29 Jun 2003 19:01:26 -0700 (PDT) Message-Id: <200306300201.h5U21QfZ069777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 02:01:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=33866 Change 33866 by marcel@marcel_nfs on 2003/06/29 19:01:24 Implement a device subtype in puc(4) so that we can distinguish between different types of UARTs. The subtype is used to allocate the properly sized register range and is exported to children for further processing (see uart_bus_puc.c for example). The code is a bit sloppy, but helps to get a feel for the problem. It can be cleaned up afterwards. On my US5 I now get the following probe and attach: puc0: addr #-# irq 43 on ebus0 uart0: on puc0 uart1: on puc0 uart2: <8250 or 16450 or compatible> addr #-# irq 41 on ebus0 uart2: fast interrupt uart3: <8250 or 16450 or compatible> addr #-# irq 42 on ebus0 uart3: fast interrupt Affected files ... .. //depot/projects/uart/dev/puc/puc.c#3 edit .. //depot/projects/uart/dev/puc/puc_ebus.c#2 edit .. //depot/projects/uart/dev/puc/pucvar.h#3 edit .. //depot/projects/uart/dev/uart/uart_bus_puc.c#2 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#3 (text+ko) ==== @@ -103,6 +103,7 @@ struct puc_device { struct resource_list resources; u_int serialfreq; + u_int subtype; }; static void puc_intr(void *arg); @@ -163,7 +164,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc) { char *typestr; - int bidx, childunit, i, irq_setup, rid, type; + int bidx, childunit, i, irq_setup, ressz, rid, type; struct puc_softc *sc; struct puc_device *pdev; struct resource *res; @@ -234,10 +235,10 @@ device_printf(dev, "ILR disabled\n"); } #ifdef PUC_DEBUG - printf("%s rid %d bst %x, start %x, end %x\n", + printf("%s rid %d bst %lx, start %lx, end %lx\n", (type == SYS_RES_MEMORY) ? "memory" : "port", rid, - (u_int)rman_get_bustag(res), (u_int)rman_get_start(res), - (u_int)rman_get_end(res)); + (u_long)rman_get_bustag(res), (u_long)rman_get_start(res), + (u_long)rman_get_end(res)); #endif } @@ -253,13 +254,24 @@ if (sc->sc_bar_mappings[bidx].res == NULL) continue; - switch (sc->sc_desc.ports[i].type) { + switch (sc->sc_desc.ports[i].type & ~PUC_PORT_SUBTYPE_MASK) { case PUC_PORT_TYPE_COM: typestr = "sio"; break; + case PUC_PORT_TYPE_UART: + typestr = "uart"; + break; default: continue; } + switch (sc->sc_desc.ports[i].type & PUC_PORT_SUBTYPE_MASK) { + case PUC_PORT_UART_SAB82532: + ressz = 64; + break; + default: + ressz = 8; + break; + } pdev = malloc(sizeof(struct puc_device), M_DEVBUF, M_NOWAIT | M_ZERO); if (!pdev) @@ -278,8 +290,8 @@ type = sc->sc_bar_mappings[bidx].type; resource_list_add(&pdev->resources, type, 0, rman_get_start(res) + sc->sc_desc.ports[i].offset, - rman_get_start(res) + sc->sc_desc.ports[i].offset + 8 - 1, - 8); + rman_get_start(res) + sc->sc_desc.ports[i].offset + + ressz - 1, ressz); rle = resource_list_find(&pdev->resources, type, 0); if (sc->barmuxed == 0) { @@ -303,9 +315,16 @@ } pdev->serialfreq = sc->sc_desc.ports[i].serialfreq; + pdev->subtype = sc->sc_desc.ports[i].type & + PUC_PORT_SUBTYPE_MASK; childunit = puc_find_free_unit(typestr); - sc->sc_ports[i].dev = device_add_child(dev, typestr, childunit); + if (childunit < 0 && strcmp(typestr, "uart") != 0) { + typestr = "uart"; + childunit = puc_find_free_unit(typestr); + } + sc->sc_ports[i].dev = device_add_child(dev, typestr, + childunit); if (sc->sc_ports[i].dev == NULL) { if (sc->barmuxed) { bus_space_unmap(rman_get_bustag(rle->res), @@ -317,8 +336,6 @@ } device_set_ivars(sc->sc_ports[i].dev, pdev); device_set_desc(sc->sc_ports[i].dev, sc->sc_desc.name); - if (!bootverbose) - device_quiet(sc->sc_ports[i].dev); #ifdef PUC_DEBUG printf("puc: type %d, bar %x, offset %x\n", sc->sc_desc.ports[i].type, @@ -556,6 +573,9 @@ case PUC_IVAR_FREQ: *result = pdev->serialfreq; break; + case PUC_IVAR_SUBTYPE: + *result = pdev->subtype; + break; default: return (ENOENT); } ==== //depot/projects/uart/dev/puc/puc_ebus.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ bzero(&dd, sizeof(dd)); dd.name = device_get_desc(dev); for (i = 0; i < 2; i++) { - dd.ports[i].type = PUC_PORT_TYPE_COM | PUC_PORT_COM_SAB82532; + dd.ports[i].type = PUC_PORT_TYPE_UART | PUC_PORT_UART_SAB82532; dd.ports[i].bar = 0; dd.ports[i].offset = 0x40 * i; dd.ports[i].serialfreq = 0; ==== //depot/projects/uart/dev/puc/pucvar.h#3 (text+ko) ==== @@ -92,10 +92,12 @@ #define PUC_PORT_TYPE_NONE 0 #define PUC_PORT_TYPE_COM 1 #define PUC_PORT_TYPE_LPT 2 +#define PUC_PORT_TYPE_UART 3 /* UART subtypes. */ -#define PUC_PORT_COM_NS8250 (0<<8) -#define PUC_PORT_COM_SAB82532 (1<<8) +#define PUC_PORT_SUBTYPE_MASK (~0xff) +#define PUC_PORT_UART_NS8250 (0<<8) +#define PUC_PORT_UART_SAB82532 (1<<8) /* Interrupt Latch Register (ILR) types */ #define PUC_ILR_TYPE_NONE 0 ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#2 (text+ko) ==== @@ -61,13 +61,25 @@ static int uart_puc_probe(device_t dev) { + device_t parent; struct uart_softc *sc; - uintptr_t rclk; + uintptr_t rclk, type; + parent = device_get_parent(dev); sc = device_get_softc(dev); - /* XXX we need to support all sorts of UARTs. */ - sc->sc_class = &uart_ns8250_class; + if (BUS_READ_IVAR(parent, dev, PUC_IVAR_SUBTYPE, &type)) + return (ENXIO); + switch (type) { + case PUC_PORT_UART_NS8250: + sc->sc_class = &uart_ns8250_class; + break; + case PUC_PORT_UART_SAB82532: + sc->sc_class = &uart_sab82532_class; + break; + default: + return (ENXIO); + } if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, &rclk)) rclk = 0; From owner-p4-projects@FreeBSD.ORG Sun Jun 29 19:26:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8A637B404; Sun, 29 Jun 2003 19:26:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E4D337B401 for ; Sun, 29 Jun 2003 19:26:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5BF944020 for ; Sun, 29 Jun 2003 19:26:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U2Qw0U078902 for ; Sun, 29 Jun 2003 19:26:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U2QwSd078899 for perforce@freebsd.org; Sun, 29 Jun 2003 19:26:58 -0700 (PDT) Date: Sun, 29 Jun 2003 19:26:58 -0700 (PDT) Message-Id: <200306300226.h5U2QwSd078899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 02:27:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=33867 Change 33867 by rwatson@rwatson_powerbook on 2003/06/29 19:26:32 Add p_label as found in TrustedBSD: temporary label storage for policies providing floating subject labels. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/proc.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/proc.h#2 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include /* For struct selinfo. */ #include +#include #include #include @@ -213,6 +214,7 @@ unsigned int unlockpc[8]; #endif /* SIGNAL_DEBUG */ #endif /* DIAGNOSTIC */ + struct label p_label; }; #else /* __APPLE_API_PRIVATE */ From owner-p4-projects@FreeBSD.ORG Sun Jun 29 19:29:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAD8B37B404; Sun, 29 Jun 2003 19:29:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C5A837B401 for ; Sun, 29 Jun 2003 19:29:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECE2444027 for ; Sun, 29 Jun 2003 19:29:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U2T10U079016 for ; Sun, 29 Jun 2003 19:29:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U2T1DG079013 for perforce@freebsd.org; Sun, 29 Jun 2003 19:29:01 -0700 (PDT) Date: Sun, 29 Jun 2003 19:29:01 -0700 (PDT) Message-Id: <200306300229.h5U2T1DG079013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 02:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=33868 Change 33868 by rwatson@rwatson_powerbook on 2003/06/29 19:28:33 Add MAC label to mbuf packet header; this is the pre-m_tag model from FreeBSD. Since Darwin doesn't have m_tags... Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#2 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include +#include /* * Mbufs are of a single size, MSIZE (machine/param.h), which @@ -130,6 +131,7 @@ struct mbuf *aux; /* extra data buffer; ipsec/others */ void *reserved1; /* for future use */ void *reserved2; /* for future use */ + struct label label; /* MAC label for packet */ }; From owner-p4-projects@FreeBSD.ORG Sun Jun 29 20:13:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3991837B404; Sun, 29 Jun 2003 20:13:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9A3937B401 for ; Sun, 29 Jun 2003 20:13:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AD4C43FE0 for ; Sun, 29 Jun 2003 20:13:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U3Du0U094073 for ; Sun, 29 Jun 2003 20:13:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U3Dun9094067 for perforce@freebsd.org; Sun, 29 Jun 2003 20:13:56 -0700 (PDT) Date: Sun, 29 Jun 2003 20:13:56 -0700 (PDT) Message-Id: <200306300313.h5U3Dun9094067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 03:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=33869 Change 33869 by rwatson@rwatson_powerbook on 2003/06/29 20:13:52 Some more thread -> uthread #ifdef out VM bits that we're not ready for Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mac.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mac.h#2 (text+ko) ==== @@ -116,7 +116,7 @@ struct sockaddr; struct socket; struct pipe; -struct thread; +struct uthread; struct timespec; struct ucred; struct uio; @@ -230,7 +230,7 @@ struct label *interpvnodelabel, struct image_params *imgp); void mac_create_proc0(struct ucred *cred); void mac_create_proc1(struct ucred *cred); -void mac_thread_userret(struct thread *td); +void mac_thread_userret(struct uthread *td); /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); @@ -339,7 +339,9 @@ struct mac *extmac); int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); +#if 0 void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); +#endif /* * Calls to help various file systems implement labeling functionality From owner-p4-projects@FreeBSD.ORG Sun Jun 29 20:20:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A632037B404; Sun, 29 Jun 2003 20:20:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15E9F37B401 for ; Sun, 29 Jun 2003 20:20:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 851D644028 for ; Sun, 29 Jun 2003 20:20:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U3K40U094576 for ; Sun, 29 Jun 2003 20:20:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U3K4n3094573 for perforce@freebsd.org; Sun, 29 Jun 2003 20:20:04 -0700 (PDT) Date: Sun, 29 Jun 2003 20:20:04 -0700 (PDT) Message-Id: <200306300320.h5U3K4n3094573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 03:20:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=33870 Change 33870 by rwatson@rwatson_powerbook on 2003/06/29 20:19:29 #if 0 references to userret; not ready for that yet. Switch curthread to curproc generally; this has unfortunate semantics, but is probably right for all the VOP's. We might be able to switch some references back using current_act() at some point. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#11 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mac.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#11 (text+ko) ==== @@ -1388,12 +1388,14 @@ MAC_PERFORM(create_proc1, cred); } +#if 0 void -mac_thread_userret(struct thread *td) +mac_thread_userret(struct uthread *td) { MAC_PERFORM(thread_userret, td); } +#endif /* * When a new process is created, its label must be initialized. Generally, @@ -1457,7 +1459,7 @@ ASSERT_VOP_LOCKED(dvp, "mac_create_vnode_extattr"); ASSERT_VOP_LOCKED(vp, "mac_create_vnode_extattr"); - error = VOP_OPENEXTATTR(vp, cred, curthread); + error = VOP_OPENEXTATTR(vp, cred, curproc); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { @@ -1472,11 +1474,11 @@ dvp, &dvp->v_label, vp, &vp->v_label, cnp); if (error) { - VOP_CLOSEEXTATTR(vp, 0, NOCRED, curthread); + VOP_CLOSEEXTATTR(vp, 0, NOCRED, curproc); return (error); } - error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curproc); if (error == EOPNOTSUPP) error = 0; /* XXX */ @@ -1492,7 +1494,7 @@ ASSERT_VOP_LOCKED(vp, "mac_setlabel_vnode_extattr"); - error = VOP_OPENEXTATTR(vp, cred, curthread); + error = VOP_OPENEXTATTR(vp, cred, curproc); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { @@ -1506,11 +1508,11 @@ MAC_CHECK(setlabel_vnode_extattr, cred, vp, &vp->v_label, intlabel); if (error) { - VOP_CLOSEEXTATTR(vp, 0, NOCRED, curthread); + VOP_CLOSEEXTATTR(vp, 0, NOCRED, curproc); return (error); } - error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curproc); if (error == EOPNOTSUPP) error = 0; /* XXX */ @@ -3363,11 +3365,11 @@ * assume VOP_SETLABEL() will do it, because we might implement * that as part of vop_stdsetlabel_ea(). */ - error = VOP_ACCESS(vp, VADMIN, cred, curthread); + error = VOP_ACCESS(vp, VADMIN, cred, curproc); if (error) return (error); - error = VOP_SETLABEL(vp, intlabel, cred, curthread); + error = VOP_SETLABEL(vp, intlabel, cred, curproc); if (error) return (error); ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mac.h#3 (text+ko) ==== @@ -230,7 +230,9 @@ struct label *interpvnodelabel, struct image_params *imgp); void mac_create_proc0(struct ucred *cred); void mac_create_proc1(struct ucred *cred); +#if 0 void mac_thread_userret(struct uthread *td); +#endif /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); From owner-p4-projects@FreeBSD.ORG Sun Jun 29 20:30:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5043C37B404; Sun, 29 Jun 2003 20:30:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEAFA37B401 for ; Sun, 29 Jun 2003 20:30:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ECBA43FF3 for ; Sun, 29 Jun 2003 20:30:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U3UH0U097570 for ; Sun, 29 Jun 2003 20:30:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U3UHbe097540 for perforce@freebsd.org; Sun, 29 Jun 2003 20:30:17 -0700 (PDT) Date: Sun, 29 Jun 2003 20:30:17 -0700 (PDT) Message-Id: <200306300330.h5U3UHbe097540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 03:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=33871 Change 33871 by rwatson@rwatson_powerbook on 2003/06/29 20:29:18 Implement M_ZERO for Darwin. Makes for much smaller diffs against the FreeBSD version of kern_mac.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_malloc.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_malloc.c#2 (text+ko) ==== @@ -304,6 +304,13 @@ mem->hdr.mlen = memsize; + /* + * XXX: If Mach supported background page zeroing, we'd want to be + * using that here somehow. + */ + if (flags & M_ZERO) + bzero(mem->hdr.dat, mem->hdr.mlen); + return (mem->hdr.dat); } ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#2 (text+ko) ==== @@ -68,6 +68,7 @@ */ #define M_WAITOK 0x0000 #define M_NOWAIT 0x0001 +#define M_ZERO 0x0100 /* bzero the allocation */ /* * Types of memory to be allocated (not all are used by us) From owner-p4-projects@FreeBSD.ORG Sun Jun 29 21:53:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51BDB37B405; Sun, 29 Jun 2003 21:53:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E7BA337B401 for ; Sun, 29 Jun 2003 21:52:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEDB243F3F for ; Sun, 29 Jun 2003 21:52:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U4qw0U029125 for ; Sun, 29 Jun 2003 21:52:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U4qvKY029113 for perforce@freebsd.org; Sun, 29 Jun 2003 21:52:57 -0700 (PDT) Date: Sun, 29 Jun 2003 21:52:57 -0700 (PDT) Message-Id: <200306300452.h5U4qvKY029113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 04:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=33873 Change 33873 by marcel@marcel_nfs on 2003/06/29 21:52:36 IFC @33872 Affected files ... .. //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_gc.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#9 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#5 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#2 integrate .. //depot/projects/ia64/share/man/man4/urio.4#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#33 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#18 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#8 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#41 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#46 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#69 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/ia64/sys/netipsec/key.c#6 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#25 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#39 integrate .. //depot/projects/ia64/sys/vm/pmap.h#18 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#57 integrate .. //depot/projects/ia64/sys/vm/vm_map.h#23 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#41 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#10 integrate Differences ... ==== //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.5 2003/05/25 08:48:11 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.6 2003/06/29 23:51:04 mtm Exp $ */ #include #include @@ -80,12 +80,12 @@ * Disconnect the thread from the joinee: */ if ((joined = pthread->join_status.thread) != NULL) { - if (_spintrylock(&joined->lock) == EBUSY) { + if (THR_TRYLOCK(&joined->lock) == EBUSY) { _thread_critical_exit(pthread); goto retry; } pthread->join_status.thread->joiner = NULL; - _spinunlock(&joined->lock); + THR_UNLOCK(&joined->lock); joined = pthread->join_status.thread = NULL; } pthread->cancelflags |= PTHREAD_CANCELLING; ==== //depot/projects/ia64/lib/libthr/thread/thr_detach.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.4 2003/06/02 11:01:00 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.5 2003/06/29 23:51:04 mtm Exp $ */ #include #include @@ -44,10 +44,10 @@ if (pthread == NULL || pthread->magic != PTHREAD_MAGIC) return (EINVAL); - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); if (pthread->attr.flags & PTHREAD_DETACHED) { - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); return (EINVAL); } @@ -73,7 +73,7 @@ _thread_critical_exit(joiner); } - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); return (0); } ==== //depot/projects/ia64/lib/libthr/thread/thr_exit.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.8 2003/05/29 20:46:53 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.9 2003/06/29 23:51:04 mtm Exp $ */ #include #include @@ -146,7 +146,7 @@ /* Check if there is a thread joining this one: */ if (curthread->joiner != NULL) { pthread = curthread->joiner; - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); curthread->joiner = NULL; /* Make the joining thread runnable: */ @@ -156,7 +156,7 @@ pthread->join_status.ret = curthread->ret; pthread->join_status.error = 0; pthread->join_status.thread = NULL; - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); /* Make this thread collectable by the garbage collector. */ PTHREAD_ASSERT(((curthread->attr.flags & PTHREAD_DETACHED) == ==== //depot/projects/ia64/lib/libthr/thread/thr_gc.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_gc.c,v 1.6 2003/05/29 20:46:53 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_gc.c,v 1.7 2003/06/29 23:51:04 mtm Exp $ * * Garbage collector thread. Frees memory allocated for dead threads. * @@ -106,7 +106,7 @@ if (pthread == _thread_initial) continue; - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); /* * Check if the stack was not specified by @@ -128,7 +128,7 @@ * it on the dead thread list. */ if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) { - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); continue; } @@ -141,7 +141,7 @@ */ pthread_cln = pthread; - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); /* * Retire the architecture specific id so it may be ==== //depot/projects/ia64/lib/libthr/thread/thr_join.c#7 (text+ko) ==== @@ -29,10 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.8 2003/05/29 20:46:53 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.9 2003/06/29 23:51:04 mtm Exp $ */ #include #include +#include #include "thr_private.h" __weak_reference(_pthread_join, pthread_join); @@ -69,7 +70,7 @@ THREAD_LIST_LOCK; TAILQ_FOREACH(thread, &_thread_list, tle) if (thread == pthread) { - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); break; } @@ -79,7 +80,7 @@ */ TAILQ_FOREACH(thread, &_dead_list, dle) if (thread == pthread) { - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); break; } @@ -87,7 +88,7 @@ if (thread == NULL || ((pthread->attr.flags & PTHREAD_DETACHED) != 0)) { if (thread != NULL) - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); THREAD_LIST_UNLOCK; DEAD_LIST_UNLOCK; ret = ESRCH; @@ -97,7 +98,7 @@ if (pthread->joiner != NULL) { /* Multiple joiners are not supported. */ /* XXXTHR - support multiple joiners. */ - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); THREAD_LIST_UNLOCK; DEAD_LIST_UNLOCK; ret = ENOTSUP; @@ -109,7 +110,7 @@ if (pthread->state != PS_DEAD) { /* Set the running thread to be the joiner: */ pthread->joiner = curthread; - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); _thread_critical_enter(curthread); /* Keep track of which thread we're joining to: */ @@ -159,7 +160,7 @@ /* Make the thread collectable by the garbage collector. */ pthread->attr.flags |= PTHREAD_DETACHED; - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); THREAD_LIST_UNLOCK; if (pthread_cond_signal(&_gc_cond) != 0) PANIC("Cannot signal gc cond"); ==== //depot/projects/ia64/lib/libthr/thread/thr_kern.c#8 (text+ko) ==== @@ -23,7 +23,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/lib/libthr/thread/thr_kern.c,v 1.9 2003/06/29 15:55:44 jdp Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.11 2003/06/29 23:51:04 mtm Exp $ */ #include @@ -55,6 +55,20 @@ void _thread_critical_enter(pthread_t pthread) { + _thread_sigblock(); + THR_LOCK(&pthread->lock); +} + +void +_thread_critical_exit(pthread_t pthread) +{ + THR_UNLOCK(&pthread->lock); + _thread_sigunblock(); +} + +void +_thread_sigblock() +{ sigset_t set; sigset_t sav; @@ -62,18 +76,13 @@ * Block all signals. */ SIGFILLSET(set); + SIGADDSET(set, SIGTHR); - /* - * We can not use the global 'restore' set until after we have - * acquired the giant lock. - */ - _SPINLOCK(&pthread->lock); - - /* If we are already in a critical section, just up the refcount */ - if (++curthread->crit_ref > 1) + /* If we have already blocked signals, just up the refcount */ + if (++curthread->signest > 1) return; - PTHREAD_ASSERT(curthread->crit_ref == 1, - ("Critical section reference count must be 1!")); + PTHREAD_ASSERT(curthread->signest == 1, + ("Blocked signal nesting level must be 1!")); if (__sys_sigprocmask(SIG_SETMASK, &set, &sav)) { _thread_printf(STDERR_FILENO, "Critical Enter: sig err %d\n", @@ -84,15 +93,15 @@ } void -_thread_critical_exit(pthread_t pthread) +_thread_sigunblock() { sigset_t set; - /* We might be in a nested critical section */ - if (--curthread->crit_ref > 0) + /* We might be in a nested 'blocked signal' section */ + if (--curthread->signest > 0) return; - PTHREAD_ASSERT(curthread->crit_ref == 0, - ("Non-Zero critical section reference count.")); + PTHREAD_ASSERT(curthread->signest == 0, + ("Non-Zero blocked signal nesting level.")); /* * Restore signals. @@ -103,7 +112,6 @@ errno); abort(); } - _SPINUNLOCK(&pthread->lock); } void ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.11 2003/06/02 10:04:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.12 2003/06/29 23:51:04 mtm Exp $ */ #include #include @@ -1263,9 +1263,9 @@ /* _thread_kern_sig_defer();*/ /* XXX - Necessary to obey lock order */ - _SPINLOCK(&pthread->lock); + THR_LOCK(&pthread->lock); mutex = pthread->data.mutex; - _SPINUNLOCK(&pthread->lock); + THR_UNLOCK(&pthread->lock); _SPINLOCK(&mutex->lock); ==== //depot/projects/ia64/lib/libthr/thread/thr_private.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.17 2003/06/29 15:55:44 jdp Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.19 2003/06/29 23:49:41 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -81,6 +81,24 @@ #define curthread _get_curthread() /* + * Locking macros + */ +#define THR_LOCK(m) \ + do { \ + if (umtx_lock((m), curthread->thr_id) != 0) \ + abort(); \ + } while (0) + +#define THR_TRYLOCK(m) _umtxtrylock((m)) + +#define THR_UNLOCK(m) \ + do { \ + if (umtx_unlock((m), curthread->thr_id) != 0) \ + abort(); \ + } while (0) + + +/* * State change macro without scheduling queue change: */ #define PTHREAD_SET_STATE(thrd, newstate) do { \ @@ -426,12 +444,12 @@ u_int64_t uniqueid; /* for gdb */ thr_id_t thr_id; sigset_t savedsig; - int crit_ref; /* crit. section netsting level */ + int signest; /* blocked signal netsting level */ /* * Lock for accesses to this thread structure. */ - spinlock_t lock; + struct umtx lock; /* Queue entry for list of all threads: */ TAILQ_ENTRY(pthread) tle; @@ -748,7 +766,6 @@ int _pthread_once(pthread_once_t *, void (*) (void)); pthread_t _pthread_self(void); int _pthread_setspecific(pthread_key_t, const void *); -int _spintrylock(spinlock_t *); void _thread_exit(char *, int, char *); void _thread_exit_cleanup(void); void *_thread_cleanup(pthread_t); @@ -766,6 +783,9 @@ int _thread_suspend(pthread_t thread, struct timespec *abstime); void _thread_critical_enter(pthread_t); void _thread_critical_exit(pthread_t); +void _thread_sigblock(); +void _thread_sigunblock(); +int _umtxtrylock(struct umtx *lck); /* #include */ #ifdef _SYS_AIO_H_ ==== //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.5 2003/06/29 00:12:40 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.6 2003/06/29 23:49:41 mtm Exp $ * */ @@ -65,10 +65,10 @@ } int -_spintrylock(spinlock_t *lck) +_umtxtrylock(struct umtx *lck) { int error; - error = umtx_trylock((struct umtx *)lck, curthread->thr_id); + error = umtx_trylock(lck, curthread->thr_id); if (error != 0 && error != EBUSY) abort(); return (error); ==== //depot/projects/ia64/rescue/rescue/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.1 2003/06/29 18:35:37 gordon Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.2 2003/06/29 20:44:12 gordon Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -133,7 +133,7 @@ CRUNCH_PROGS+= mca gpt .endif -.if ${MACHINE_ARCH} == "sparc" +.if ${MACHINE_ARCH} == "sparc64" .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/ia64/share/man/man4/urio.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/urio.4,v 1.8 2003/03/25 15:01:10 keramida Exp $ +.\" $FreeBSD: src/share/man/man4/urio.4,v 1.9 2003/06/30 03:16:41 mph Exp $ .\" .Dd March 5, 2000 .Dt URIO 4 @@ -74,7 +74,7 @@ utility (see the .Sx SEE ALSO section): -.Dl rio_add_song /usr/local/MP3/TraceyChapman/02-Fast-Car.mp3 +.Dl rio_add_song /usr/local/MP3/TracyChapman/02-Fast-Car.mp3 .Sh SEE ALSO .Xr ohci 4 , .Xr uhci 4 , ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#33 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.127 2003/06/28 21:21:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.128 2003/06/29 21:20:02 alc Exp $"); #include #include @@ -330,8 +330,6 @@ static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); @@ -1973,7 +1971,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { register pt_entry_t *pte; ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.417 2003/06/26 01:04:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.418 2003/06/29 21:20:03 alc Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -208,8 +208,6 @@ static void amd64_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, @@ -1951,7 +1949,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { pt_entry_t *pte; ==== //depot/projects/ia64/sys/boot/common/loader.8#18 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.56 2003/05/17 22:17:23 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.57 2003/06/29 20:57:55 brueffer Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -57,7 +57,7 @@ The main drive behind these commands is user-friendliness. The bigger component is an .Tn ANS -Forth compatible Forth interpreter based on ficl, by +Forth compatible Forth interpreter based on FICL, by .An John Sadler . .Pp During initialization, ==== //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#9 (text+ko) ==== @@ -1,25 +1,19 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.15 2003/06/07 17:42:26 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.16 2003/06/30 00:15:38 ru Exp $ -SRCS= boot.c inflate.c lib.c +SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP -LDFLAGS=-nostdlib -static -r +LDFLAGS=-nostdlib -static -Wl,-r .PATH: ${.CURDIR}/../../../kern -.for asm in start crt sio -OBJS+= ${asm}.o -${asm}.o: ${asm}.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} -.endfor - CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} -all: ${OBJS} kgzldr.o +all: kgzldr.o kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} @@ -28,4 +22,4 @@ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ kgzldr.o ${DESTDIR}${LIBDIR} -.include +.include ==== //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#8 (text+ko) ==== @@ -1,28 +1,22 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.9 2003/06/07 17:42:26 obrien Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.10 2003/06/30 00:20:28 ru Exp $ -SRCS= boot.c inflate.c lib.c +SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP -LDFLAGS=-nostdlib -static -r +LDFLAGS=-nostdlib -static -Wl,-r .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr AFLAGS+=--defsym PC98=1 -.for asm in start crt sio -OBJS+= ${asm}.o -${asm}.o: ${asm}.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} -.endfor - CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x238 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} -all: ${OBJS} kgzldr.o +all: kgzldr.o kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} @@ -31,4 +25,4 @@ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ kgzldr.o ${DESTDIR}${LIBDIR} -.include +.include ==== //depot/projects/ia64/sys/dev/wi/if_wi.c#41 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.144 2003/06/28 06:17:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.145 2003/06/29 20:14:35 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -347,6 +347,10 @@ ic->ic_channels[val].ic_flags != 0, ("wi_attach: invalid own channel %u!", val)); ic->ic_ibss_chan = &ic->ic_channels[val]; + } else { + device_printf(dev, + "WI_RID_OWN_CHNL failed, using first channel!\n"); + ic->ic_ibss_chan = &ic->ic_channels[0]; } /* ==== //depot/projects/ia64/sys/i386/i386/pmap.c#46 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.413 2003/06/27 22:39:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.414 2003/06/29 21:20:03 alc Exp $"); /*- * Copyright (c) 2003 Networks Associates Technology, Inc. * All rights reserved. @@ -243,8 +243,6 @@ static void i386_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, @@ -2090,7 +2088,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { pt_entry_t *pte; ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#69 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.112 2003/06/29 06:10:32 alc Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.113 2003/06/29 21:20:03 alc Exp $ */ /* @@ -267,7 +267,6 @@ static pmap_t pmap_install(pmap_t); static void pmap_invalidate_all(pmap_t pmap); -static void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m); vm_offset_t pmap_steal_memory(vm_size_t size) @@ -1709,8 +1708,8 @@ * but is *MUCH* faster than pmap_enter... */ -static void -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m) +vm_page_t +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { struct ia64_lpte *pte; pmap_t oldpmap; @@ -1719,7 +1718,7 @@ pte = pmap_find_pte(va); if (pte->pte_p) - return; + goto reinstall; /* * Enter on the PV list since its part of our managed memory. @@ -1737,8 +1736,9 @@ pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), PTE_IG_MANAGED, PTE_PL_USER, PTE_AR_R); - +reinstall: pmap_install(oldpmap); + return (NULL); } /* @@ -1821,7 +1821,8 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, - addr + ia64_ptob(tmpidx), p); + addr + ia64_ptob(tmpidx), p, + NULL); VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); @@ -1855,7 +1856,8 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, - addr + ia64_ptob(tmpidx), p); + addr + ia64_ptob(tmpidx), p, + NULL); VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); @@ -1951,7 +1953,7 @@ } vm_page_busy(m); vm_page_unlock_queues(); - pmap_enter_quick(pmap, addr, m); + pmap_enter_quick(pmap, addr, m, NULL); vm_page_lock_queues(); vm_page_wakeup(m); } ==== //depot/projects/ia64/sys/net80211/ieee80211.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.3 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.4 2003/06/29 20:10:54 sam Exp $"); /* * IEEE 802.11 generic handler @@ -197,10 +197,13 @@ return c - ic->ic_channels; else if (c == IEEE80211_CHAN_ANYC) return IEEE80211_CHAN_ANY; - else { + else if (c != NULL) { if_printf(&ic->ic_if, "invalid channel freq %u flags %x\n", c->ic_freq, c->ic_flags); return 0; /* XXX */ + } else { + if_printf(&ic->ic_if, "invalid channel (NULL)\n"); + return 0; /* XXX */ } } ==== //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.2 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.3 2003/06/29 20:12:17 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) @@ -404,7 +404,7 @@ } memset(ic->ic_des_essid, 0, sizeof(ic->ic_des_essid)); ic->ic_des_esslen = le16toh(wreq.wi_val[0]) * 2; - memcpy(ic->ic_des_essid, &wreq.wi_val[1], len); + memcpy(ic->ic_des_essid, &wreq.wi_val[1], ic->ic_des_esslen); error = ENETRESET; break; case WI_RID_CURRENT_BSSID: ==== //depot/projects/ia64/sys/net80211/ieee80211_node.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.2 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.3 2003/06/29 20:13:38 sam Exp $"); #include "opt_inet.h" @@ -87,7 +87,8 @@ ic->ic_node_free = ieee80211_node_free; ic->ic_node_copy = ieee80211_node_copy; ic->ic_bss = (*ic->ic_node_alloc)(ic); - /* XXX KASSERT != NULL? */ + KASSERT(ic->ic_bss != NULL, ("unable to setup inital BSS node")); + ic->ic_bss->ni_chan = IEEE80211_CHAN_ANYC; } void ==== //depot/projects/ia64/sys/netipsec/ipsec.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.4 2003/02/28 20:06:29 sam Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.5 2003/06/29 23:58:38 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -1922,6 +1922,8 @@ { struct xformsw *xsp; + if (sav->tdb_xform != NULL) /* previously initialized */ + return 0; for (xsp = xforms; xsp; xsp = xsp->xf_next) if (xsp->xf_type == xftype) return (*xsp->xf_init)(sav, xsp); ==== //depot/projects/ia64/sys/netipsec/key.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.5 2003/02/19 05:47:36 imp Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.6 2003/06/29 23:58:38 sam Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -2751,13 +2751,24 @@ if (__LIST_CHAINED(sav)) LIST_REMOVE(sav, chain); + /* + * Cleanup xform state. Note that zeroize'ing causes the + * keys to be cleared; otherwise we must do it ourself. + */ + if (sav->tdb_xform != NULL) { + sav->tdb_xform->xf_zeroize(sav); + sav->tdb_xform = NULL; + } else { + if (sav->key_auth != NULL) + bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); + if (sav->key_enc != NULL) + bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc)); + } if (sav->key_auth != NULL) { - bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); KFREE(sav->key_auth); sav->key_auth = NULL; } if (sav->key_enc != NULL) { - bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc)); KFREE(sav->key_enc); sav->key_enc = NULL; } ==== //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#25 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.57 2003/06/14 23:23:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.58 2003/06/29 21:20:04 alc Exp $"); /* * Manages physical address maps. @@ -1032,6 +1032,14 @@ pmap_syncicache(VM_PAGE_TO_PHYS(m), PAGE_SIZE); } +vm_page_t +pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) +{ + + pmap_enter(pm, va, m, VM_PROT_READ | VM_PROT_EXECUTE, FALSE); + return (NULL); +} + vm_offset_t pmap_extract(pmap_t pm, vm_offset_t va) { ==== //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#39 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.115 2003/06/18 17:03:04 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.116 2003/06/29 21:20:04 alc Exp $ */ /* @@ -1331,6 +1331,14 @@ } } +vm_page_t +pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) +{ + + pmap_enter(pm, va, m, VM_PROT_READ | VM_PROT_EXECUTE, FALSE); + return (NULL); +} + void pmap_object_init_pt(pmap_t pm, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int limit) ==== //depot/projects/ia64/sys/vm/pmap.h#18 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.59 2003/06/14 23:23:55 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.60 2003/06/29 21:20:04 alc Exp $ */ /* @@ -103,6 +103,8 @@ void pmap_copy_page(vm_page_t, vm_page_t); void pmap_enter(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_page_t mpte); vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va); void pmap_growkernel(vm_offset_t); void pmap_init(vm_paddr_t, vm_paddr_t); @@ -110,7 +112,7 @@ boolean_t pmap_ts_referenced(vm_page_t m); vm_offset_t pmap_map(vm_offset_t *, vm_paddr_t, vm_paddr_t, int); void pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_pindex_t pindex, vm_offset_t size, + vm_object_t object, vm_pindex_t pindex, vm_size_t size, int pagelimit); boolean_t pmap_page_exists_quick(pmap_t pmap, vm_page_t m); void pmap_page_protect(vm_page_t m, vm_prot_t prot); ==== //depot/projects/ia64/sys/vm/vm_map.c#57 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.301 2003/06/29 23:32:55 alc Exp $"); #include #include @@ -911,11 +911,9 @@ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 29 22:31:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8189037B404; Sun, 29 Jun 2003 22:31:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F4D437B401 for ; Sun, 29 Jun 2003 22:31:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52B7E43F85 for ; Sun, 29 Jun 2003 22:31:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U5Vo0U041411 for ; Sun, 29 Jun 2003 22:31:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U5Vn3K041402 for perforce@freebsd.org; Sun, 29 Jun 2003 22:31:49 -0700 (PDT) Date: Sun, 29 Jun 2003 22:31:49 -0700 (PDT) Message-Id: <200306300531.h5U5Vn3K041402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 05:31:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=33879 Change 33879 by marcel@marcel_nfs on 2003/06/29 22:31:43 IFC @33872 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#2 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#2 integrate .. //depot/projects/uart/boot/common/loader.8#2 integrate .. //depot/projects/uart/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/uart/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/uart/dev/wi/if_wi.c#2 integrate .. //depot/projects/uart/i386/i386/pmap.c#2 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#3 integrate .. //depot/projects/uart/net80211/ieee80211.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#2 integrate .. //depot/projects/uart/netipsec/ipsec.c#2 integrate .. //depot/projects/uart/netipsec/key.c#2 integrate .. //depot/projects/uart/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/uart/vm/pmap.h#2 integrate .. //depot/projects/uart/vm/vm_map.c#2 integrate .. //depot/projects/uart/vm/vm_map.h#2 integrate .. //depot/projects/uart/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.127 2003/06/28 21:21:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.128 2003/06/29 21:20:02 alc Exp $"); #include #include @@ -330,8 +330,6 @@ static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); @@ -1973,7 +1971,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { register pt_entry_t *pte; ==== //depot/projects/uart/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.417 2003/06/26 01:04:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.418 2003/06/29 21:20:03 alc Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -208,8 +208,6 @@ static void amd64_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, @@ -1951,7 +1949,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { pt_entry_t *pte; ==== //depot/projects/uart/boot/common/loader.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.56 2003/05/17 22:17:23 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.57 2003/06/29 20:57:55 brueffer Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -57,7 +57,7 @@ The main drive behind these commands is user-friendliness. The bigger component is an .Tn ANS -Forth compatible Forth interpreter based on ficl, by +Forth compatible Forth interpreter based on FICL, by .An John Sadler . .Pp During initialization, ==== //depot/projects/uart/boot/i386/kgzldr/Makefile#2 (text+ko) ==== @@ -1,25 +1,19 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.15 2003/06/07 17:42:26 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.16 2003/06/30 00:15:38 ru Exp $ -SRCS= boot.c inflate.c lib.c +SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP -LDFLAGS=-nostdlib -static -r +LDFLAGS=-nostdlib -static -Wl,-r .PATH: ${.CURDIR}/../../../kern -.for asm in start crt sio -OBJS+= ${asm}.o -${asm}.o: ${asm}.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} -.endfor - CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} -all: ${OBJS} kgzldr.o +all: kgzldr.o kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} @@ -28,4 +22,4 @@ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ kgzldr.o ${DESTDIR}${LIBDIR} -.include +.include ==== //depot/projects/uart/boot/pc98/kgzldr/Makefile#2 (text+ko) ==== @@ -1,28 +1,22 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.9 2003/06/07 17:42:26 obrien Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.10 2003/06/30 00:20:28 ru Exp $ -SRCS= boot.c inflate.c lib.c +SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP -LDFLAGS=-nostdlib -static -r +LDFLAGS=-nostdlib -static -Wl,-r .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr AFLAGS+=--defsym PC98=1 -.for asm in start crt sio -OBJS+= ${asm}.o -${asm}.o: ${asm}.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} -.endfor - CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x238 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} -all: ${OBJS} kgzldr.o +all: kgzldr.o kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} @@ -31,4 +25,4 @@ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ kgzldr.o ${DESTDIR}${LIBDIR} -.include +.include ==== //depot/projects/uart/dev/wi/if_wi.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.144 2003/06/28 06:17:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.145 2003/06/29 20:14:35 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -347,6 +347,10 @@ ic->ic_channels[val].ic_flags != 0, ("wi_attach: invalid own channel %u!", val)); ic->ic_ibss_chan = &ic->ic_channels[val]; + } else { + device_printf(dev, + "WI_RID_OWN_CHNL failed, using first channel!\n"); + ic->ic_ibss_chan = &ic->ic_channels[0]; } /* ==== //depot/projects/uart/i386/i386/pmap.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.413 2003/06/27 22:39:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.414 2003/06/29 21:20:03 alc Exp $"); /*- * Copyright (c) 2003 Networks Associates Technology, Inc. * All rights reserved. @@ -243,8 +243,6 @@ static void i386_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, @@ -2090,7 +2088,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { pt_entry_t *pte; ==== //depot/projects/uart/ia64/ia64/pmap.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.112 2003/06/29 06:10:32 alc Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.113 2003/06/29 21:20:03 alc Exp $ */ /* @@ -267,7 +267,6 @@ static pmap_t pmap_install(pmap_t); static void pmap_invalidate_all(pmap_t pmap); -static void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m); vm_offset_t pmap_steal_memory(vm_size_t size) @@ -1709,8 +1708,8 @@ * but is *MUCH* faster than pmap_enter... */ -static void -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m) +vm_page_t +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { struct ia64_lpte *pte; pmap_t oldpmap; @@ -1719,7 +1718,7 @@ pte = pmap_find_pte(va); if (pte->pte_p) - return; + goto reinstall; /* * Enter on the PV list since its part of our managed memory. @@ -1737,8 +1736,9 @@ pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), PTE_IG_MANAGED, PTE_PL_USER, PTE_AR_R); - +reinstall: pmap_install(oldpmap); + return (NULL); } /* @@ -1821,7 +1821,8 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, - addr + ia64_ptob(tmpidx), p); + addr + ia64_ptob(tmpidx), p, + NULL); VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); @@ -1855,7 +1856,8 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); pmap_enter_quick(pmap, - addr + ia64_ptob(tmpidx), p); + addr + ia64_ptob(tmpidx), p, + NULL); VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); @@ -1951,7 +1953,7 @@ } vm_page_busy(m); vm_page_unlock_queues(); - pmap_enter_quick(pmap, addr, m); + pmap_enter_quick(pmap, addr, m, NULL); vm_page_lock_queues(); vm_page_wakeup(m); } ==== //depot/projects/uart/net80211/ieee80211.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.3 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.4 2003/06/29 20:10:54 sam Exp $"); /* * IEEE 802.11 generic handler @@ -197,10 +197,13 @@ return c - ic->ic_channels; else if (c == IEEE80211_CHAN_ANYC) return IEEE80211_CHAN_ANY; - else { + else if (c != NULL) { if_printf(&ic->ic_if, "invalid channel freq %u flags %x\n", c->ic_freq, c->ic_flags); return 0; /* XXX */ + } else { + if_printf(&ic->ic_if, "invalid channel (NULL)\n"); + return 0; /* XXX */ } } ==== //depot/projects/uart/net80211/ieee80211_ioctl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.2 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.3 2003/06/29 20:12:17 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) @@ -404,7 +404,7 @@ } memset(ic->ic_des_essid, 0, sizeof(ic->ic_des_essid)); ic->ic_des_esslen = le16toh(wreq.wi_val[0]) * 2; - memcpy(ic->ic_des_essid, &wreq.wi_val[1], len); + memcpy(ic->ic_des_essid, &wreq.wi_val[1], ic->ic_des_esslen); error = ENETRESET; break; case WI_RID_CURRENT_BSSID: ==== //depot/projects/uart/net80211/ieee80211_node.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.2 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.3 2003/06/29 20:13:38 sam Exp $"); #include "opt_inet.h" @@ -87,7 +87,8 @@ ic->ic_node_free = ieee80211_node_free; ic->ic_node_copy = ieee80211_node_copy; ic->ic_bss = (*ic->ic_node_alloc)(ic); - /* XXX KASSERT != NULL? */ + KASSERT(ic->ic_bss != NULL, ("unable to setup inital BSS node")); + ic->ic_bss->ni_chan = IEEE80211_CHAN_ANYC; } void ==== //depot/projects/uart/netipsec/ipsec.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.4 2003/02/28 20:06:29 sam Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.5 2003/06/29 23:58:38 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -1922,6 +1922,8 @@ { struct xformsw *xsp; + if (sav->tdb_xform != NULL) /* previously initialized */ + return 0; for (xsp = xforms; xsp; xsp = xsp->xf_next) if (xsp->xf_type == xftype) return (*xsp->xf_init)(sav, xsp); ==== //depot/projects/uart/netipsec/key.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.5 2003/02/19 05:47:36 imp Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.6 2003/06/29 23:58:38 sam Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -2751,13 +2751,24 @@ if (__LIST_CHAINED(sav)) LIST_REMOVE(sav, chain); + /* + * Cleanup xform state. Note that zeroize'ing causes the + * keys to be cleared; otherwise we must do it ourself. + */ + if (sav->tdb_xform != NULL) { + sav->tdb_xform->xf_zeroize(sav); + sav->tdb_xform = NULL; + } else { + if (sav->key_auth != NULL) + bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); + if (sav->key_enc != NULL) + bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc)); + } if (sav->key_auth != NULL) { - bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); KFREE(sav->key_auth); sav->key_auth = NULL; } if (sav->key_enc != NULL) { - bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc)); KFREE(sav->key_enc); sav->key_enc = NULL; } ==== //depot/projects/uart/powerpc/powerpc/pmap.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.57 2003/06/14 23:23:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.58 2003/06/29 21:20:04 alc Exp $"); /* * Manages physical address maps. @@ -1032,6 +1032,14 @@ pmap_syncicache(VM_PAGE_TO_PHYS(m), PAGE_SIZE); } +vm_page_t +pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) +{ + + pmap_enter(pm, va, m, VM_PROT_READ | VM_PROT_EXECUTE, FALSE); + return (NULL); +} + vm_offset_t pmap_extract(pmap_t pm, vm_offset_t va) { ==== //depot/projects/uart/sparc64/sparc64/pmap.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.115 2003/06/18 17:03:04 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.116 2003/06/29 21:20:04 alc Exp $ */ /* @@ -1331,6 +1331,14 @@ } } +vm_page_t +pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_page_t mpte) +{ + + pmap_enter(pm, va, m, VM_PROT_READ | VM_PROT_EXECUTE, FALSE); + return (NULL); +} + void pmap_object_init_pt(pmap_t pm, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int limit) ==== //depot/projects/uart/vm/pmap.h#2 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.59 2003/06/14 23:23:55 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.60 2003/06/29 21:20:04 alc Exp $ */ /* @@ -103,6 +103,8 @@ void pmap_copy_page(vm_page_t, vm_page_t); void pmap_enter(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_page_t mpte); vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va); void pmap_growkernel(vm_offset_t); void pmap_init(vm_paddr_t, vm_paddr_t); @@ -110,7 +112,7 @@ boolean_t pmap_ts_referenced(vm_page_t m); vm_offset_t pmap_map(vm_offset_t *, vm_paddr_t, vm_paddr_t, int); void pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_pindex_t pindex, vm_offset_t size, + vm_object_t object, vm_pindex_t pindex, vm_size_t size, int pagelimit); boolean_t pmap_page_exists_quick(pmap_t pmap, vm_page_t m); void pmap_page_protect(vm_page_t m, vm_prot_t prot); ==== //depot/projects/uart/vm/vm_map.c#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.301 2003/06/29 23:32:55 alc Exp $"); #include #include @@ -911,11 +911,9 @@ #endif if (cow & (MAP_PREFAULT|MAP_PREFAULT_PARTIAL)) { - mtx_lock(&Giant); - pmap_object_init_pt(map->pmap, start, + vm_map_pmap_enter(map, start, object, OFF_TO_IDX(offset), end - start, cow & MAP_PREFAULT_PARTIAL); - mtx_unlock(&Giant); } return (KERN_SUCCESS); @@ -1272,6 +1270,23 @@ } /* + * vm_map_pmap_enter: + * + * Preload the mappings for the given object into the specified + * map. This eliminates the soft faults on process startup and + * immediately after an mmap(2). + */ +void +vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, + vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags) +{ + + mtx_lock(&Giant); + pmap_object_init_pt(map->pmap, addr, object, pindex, size, flags); + mtx_unlock(&Giant); +} + +/* * vm_map_protect: * * Sets the protection of the specified address @@ -1491,16 +1506,13 @@ vm_object_madvise(current->object.vm_object, pindex, count, behav); if (behav == MADV_WILLNEED) { - mtx_lock(&Giant); - pmap_object_init_pt( - map->pmap, + vm_map_pmap_enter(map, useStart, current->object.vm_object, pindex, (count << PAGE_SHIFT), MAP_PREFAULT_MADVISE ); - mtx_unlock(&Giant); } } vm_map_unlock_read(map); ==== //depot/projects/uart/vm/vm_map.h#2 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.h,v 1.98 2003/06/15 07:28:33 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.h,v 1.99 2003/06/29 23:32:55 alc Exp $ */ /* @@ -310,6 +310,8 @@ void vm_map_lookup_done (vm_map_t, vm_map_entry_t); boolean_t vm_map_lookup_entry (vm_map_t, vm_offset_t, vm_map_entry_t *); int vm_map_clean (vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t); +void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, + vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); int vm_map_protect (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t); int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t); void vm_map_startup (void); ==== //depot/projects/uart/vm/vm_pageout.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.237 2003/06/28 20:07:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.238 2003/06/29 19:51:24 alc Exp $"); #include "opt_vm.h" #include @@ -472,7 +472,7 @@ vm_page_t p, next; int actcount, rcount, remove_mode; - GIANT_REQUIRED; + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); if (object->type == OBJT_DEVICE || object->type == OBJT_PHYS) return; @@ -556,7 +556,6 @@ vm_object_t obj, bigobj; int nothingwired; - GIANT_REQUIRED; if (!vm_map_trylock(map)) return; @@ -571,10 +570,15 @@ while (tmpe != &map->header) { if ((tmpe->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) { obj = tmpe->object.vm_object; - if ((obj != NULL) && (obj->shadow_count <= 1) && - ((bigobj == NULL) || - (bigobj->resident_page_count < obj->resident_page_count))) { - bigobj = obj; + if (obj != NULL && VM_OBJECT_TRYLOCK(obj)) { + if (obj->shadow_count <= 1 && + (bigobj == NULL || + bigobj->resident_page_count < obj->resident_page_count)) { + if (bigobj != NULL) + VM_OBJECT_UNLOCK(bigobj); + bigobj = obj; + } else + VM_OBJECT_UNLOCK(obj); } } if (tmpe->wired_count > 0) @@ -582,9 +586,10 @@ tmpe = tmpe->next; } - if (bigobj) + if (bigobj != NULL) { vm_pageout_object_deactivate_pages(map, bigobj, desired); - + VM_OBJECT_UNLOCK(bigobj); + } /* * Next, hunt around for other pages to deactivate. We actually * do this search sort of wrong -- .text first is not the best idea. @@ -595,8 +600,11 @@ break; if ((tmpe->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) { obj = tmpe->object.vm_object; - if (obj) + if (obj != NULL) { + VM_OBJECT_LOCK(obj); vm_pageout_object_deactivate_pages(map, obj, desired); + VM_OBJECT_UNLOCK(obj); + } } tmpe = tmpe->next; } @@ -606,6 +614,7 @@ * table pages. */ if (desired == 0 && nothingwired) { + GIANT_REQUIRED; vm_page_lock_queues(); pmap_remove(vm_map_pmap(map), vm_map_min(map), vm_map_max(map)); From owner-p4-projects@FreeBSD.ORG Mon Jun 30 09:22:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA1B537B404; Mon, 30 Jun 2003 09:22:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7568A37B401; Mon, 30 Jun 2003 09:22:44 -0700 (PDT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id B913B43FEC; Mon, 30 Jun 2003 09:22:43 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h5UGMgaQ012635; Mon, 30 Jun 2003 09:22:42 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h5UGMgls012634; Mon, 30 Jun 2003 09:22:42 -0700 (PDT) Date: Mon, 30 Jun 2003 09:22:42 -0700 From: "David O'Brien" To: Peter Wemm Message-ID: <20030630162242.GA12608@dragon.nuxi.com> References: <200306270053.h5R0r4Kt005391@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200306270053.h5R0r4Kt005391@repoman.freebsd.org> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.1-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Perforce Change Reviews Subject: Re: PERFORCE change 33723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 16:22:46 -0000 I'll do something about this today. On Thu, Jun 26, 2003 at 05:53:04PM -0700, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=33723 > > Change 33723 by peter@peter_hammer on 2003/06/26 17:52:45 > > Back out the evil hack to binutils contrib sources. David may > find this less offensive. Instead of configuring libbfd with > two ambiguous elf32_i386 targets, just configure one of them. This > stops the autodetect code from complaining about the ambiguity. > I think this is a bug on the i386 platform too, FWIW. > > Affected files ... > > .. //depot/projects/hammer/contrib/binutils/bfd/elf32-i386-fbsd.c#3 edit > .. //depot/projects/hammer/contrib/binutils/bfd/elf32-i386.c#6 edit > .. //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#3 edit > .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 edit > > Differences ... > > ==== //depot/projects/hammer/contrib/binutils/bfd/elf32-i386-fbsd.c#3 (text+ko) ==== > > @@ -22,9 +22,6 @@ > #define ELF_ARCH bfd_arch_i386 > #define ELF_MACHINE_CODE EM_386 > #define ELF_MAXPAGESIZE 0x1000 > -#ifdef __amd64__ > -#define ELF_OSABI ELFOSABI_FREEBSD > -#endif > > #include "bfd.h" > #include "sysdep.h" > > ==== //depot/projects/hammer/contrib/binutils/bfd/elf32-i386.c#6 (text+ko) ==== > > @@ -629,20 +629,6 @@ > /* Allocate our special target data. */ > struct elf_i386_obj_tdata *new_tdata; > bfd_size_type amt = sizeof (struct elf_i386_obj_tdata); > -#ifdef __amd64__ > - Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form. */ > - > - i_ehdrp = elf_elfheader (abfd); > - > -#ifdef ELF_OSABI > - if (i_ehdrp->e_ident[EI_OSABI] != ELF_OSABI) > - return false; > -#endif > -#if defined(__FreeBSD__) && !defined(ELF_OSABI) > - if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_FREEBSD) > - return false; > -#endif > -#endif > new_tdata = bfd_zalloc (abfd, amt); > if (new_tdata == NULL) > return false; > > ==== //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#3 (text+ko) ==== > > @@ -21,5 +21,5 @@ > the Free Software Foundation, 59 Temple Place - Suite 330, > Boston, MA 02111-1307, USA. */ > > -#define TARGET_64BIT_DEFAULT 1 > -#define TARGET_BI_ARCH 1 > +#define TARGET_64BIT_DEFAULT > +#define TARGET_BI_ARCH > > ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 (text+ko) ==== > > @@ -1,21 +1,22 @@ > # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ > > -.include "${.CURDIR}/Makefile.i386" > - > -# Get the i386 DEFAULT_VECTOR and VECS. > -I386_VECS:= ${VECS} > - > DEFAULT_VECTOR= bfd_elf64_x86_64_vec > > -VECS= bfd_elf64_x86_64_vec ${I386_VECS} > +VECS= bfd_elf64_x86_64_vec bfd_elf32_i386_freebsd_vec > > SRCS+= elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c > +SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c > > CLEANFILES+= elf64-target.h > > elf64-target.h: elfxx-target.h > sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} > > +CLEANFILES+= elf32-target.h > + > +elf32-target.h: elfxx-target.h > + sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} > + > CLEANFILES+= elf64-amd64-fbsd.c > > elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c From owner-p4-projects@FreeBSD.ORG Mon Jun 30 13:24:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CF437B405; Mon, 30 Jun 2003 13:24:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D87C37B40E for ; Mon, 30 Jun 2003 13:24:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18D0543F93 for ; Mon, 30 Jun 2003 13:24:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5UKNx0U041935 for ; Mon, 30 Jun 2003 13:23:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5UKNxFC041929 for perforce@freebsd.org; Mon, 30 Jun 2003 13:23:59 -0700 (PDT) Date: Mon, 30 Jun 2003 13:23:59 -0700 (PDT) Message-Id: <200306302023.h5UKNxFC041929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 20:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=33900 Change 33900 by rwatson@rwatson_powerbook on 2003/06/30 13:23:24 #define MA_OWNED and PROC_LOCK_ASSERT to allow our lock assertions to compile; this way we can keep them in the code minimizing diffs and documenting potential locking require when/if Darwin locking matures. Define M_MACPIPELABEL and M_MACTEMP in the centralized BSD malloc types. Use current_proc() in preference to curproc. Define VADMIN. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#12 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/vnode.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#12 (text+ko) ==== @@ -87,6 +87,8 @@ #define TUNABLE_INT(x, y) #define WITNESS_WARN(x, y, z, ...) #define mtx_assert(x, y) +#define MA_OWNED +#define PROC_LOCK_ASSERT(x, y) SYSCTL_DECL(_security); @@ -239,9 +241,6 @@ static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); -MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); -MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); - /* * mac_static_policy_list holds a list of policy modules that are not * loaded while the system is "live", and cannot be unloaded. These @@ -1459,7 +1458,7 @@ ASSERT_VOP_LOCKED(dvp, "mac_create_vnode_extattr"); ASSERT_VOP_LOCKED(vp, "mac_create_vnode_extattr"); - error = VOP_OPENEXTATTR(vp, cred, curproc); + error = VOP_OPENEXTATTR(vp, cred, current_proc()); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { @@ -1474,11 +1473,11 @@ dvp, &dvp->v_label, vp, &vp->v_label, cnp); if (error) { - VOP_CLOSEEXTATTR(vp, 0, NOCRED, curproc); + VOP_CLOSEEXTATTR(vp, 0, NOCRED, current_proc()); return (error); } - error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curproc); + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, current_proc()); if (error == EOPNOTSUPP) error = 0; /* XXX */ @@ -1494,7 +1493,7 @@ ASSERT_VOP_LOCKED(vp, "mac_setlabel_vnode_extattr"); - error = VOP_OPENEXTATTR(vp, cred, curproc); + error = VOP_OPENEXTATTR(vp, cred, current_proc()); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { @@ -1508,11 +1507,11 @@ MAC_CHECK(setlabel_vnode_extattr, cred, vp, &vp->v_label, intlabel); if (error) { - VOP_CLOSEEXTATTR(vp, 0, NOCRED, curproc); + VOP_CLOSEEXTATTR(vp, 0, NOCRED, current_proc()); return (error); } - error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curproc); + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, current_proc()); if (error == EOPNOTSUPP) error = 0; /* XXX */ @@ -3365,11 +3364,11 @@ * assume VOP_SETLABEL() will do it, because we might implement * that as part of vop_stdsetlabel_ea(). */ - error = VOP_ACCESS(vp, VADMIN, cred, curproc); + error = VOP_ACCESS(vp, VADMIN, cred, current_proc()); if (error) return (error); - error = VOP_SETLABEL(vp, intlabel, cred, curproc); + error = VOP_SETLABEL(vp, intlabel, cred, current_proc()); if (error) return (error); ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#3 (text+ko) ==== @@ -167,8 +167,10 @@ #define M_IGMP 90 #define M_JNL_JNL 91 /* Journaling: "struct journal" */ #define M_JNL_TR 92 /* Journaling: "struct transaction" */ +#define M_MACPIPELABEL 93 +#define M_MACTEMP 94 -#define M_LAST 93 /* Must be last type + 1 */ +#define M_LAST 95 /* Must be last type + 1 */ /* Strings corresponding to types of memory */ /* Must be in synch with the #defines above */ @@ -265,7 +267,9 @@ "TCP Segment Q",/* 89 M_TSEGQ */\ "IGMP state", /* 90 M_IGMP */\ "Journal", /* 91 M_JNL_JNL */\ - "Transaction" /* 92 M_JNL_TR */\ + "Transaction", /* 92 M_JNL_TR */\ + "macpipelabel", /* 93 M_MACPIPELABEL */\ + "mactemp", /* 94 M_MACTEMP */\ } struct kmemstats { ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/vnode.h#3 (text+ko) ==== @@ -248,6 +248,7 @@ /* * Modes. Some values same as Ixxx entries from inode.h for now. */ +#define VADMIN 10000 /* permission to administer */ #define VSUID 04000 /* set user id on execution */ #define VSGID 02000 /* set group id on execution */ #define VSVTX 01000 /* save swapped text even after use */ From owner-p4-projects@FreeBSD.ORG Mon Jun 30 13:35:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F234937B404; Mon, 30 Jun 2003 13:35:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A40DF37B401 for ; Mon, 30 Jun 2003 13:35:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4571943FB1 for ; Mon, 30 Jun 2003 13:35:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5UKZE0U045190 for ; Mon, 30 Jun 2003 13:35:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5UKZDDr045187 for perforce@freebsd.org; Mon, 30 Jun 2003 13:35:13 -0700 (PDT) Date: Mon, 30 Jun 2003 13:35:13 -0700 (PDT) Message-Id: <200306302035.h5UKZDDr045187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 33901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 20:35:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=33901 Change 33901 by rwatson@rwatson_powerbook on 2003/06/30 13:34:39 Darwin doesn't use a separate DTYPE for FIFO's. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#13 (text+ko) ==== @@ -3579,7 +3579,9 @@ label_type = fp->f_type; switch (fp->f_type) { +#if 0 case DTYPE_FIFO: +#endif case DTYPE_VNODE: vp = fp->f_data; @@ -3609,7 +3611,9 @@ fdrop(fp, td); switch (label_type) { +#if 0 case DTYPE_FIFO: +#endif case DTYPE_VNODE: if (error == 0) error = mac_externalize_vnode_label(&intlabel, @@ -3798,7 +3802,9 @@ goto out; switch (fp->f_type) { +#if 0 case DTYPE_FIFO: +#endif case DTYPE_VNODE: mac_init_vnode_label(&intlabel); error = mac_internalize_vnode_label(&intlabel, buffer); From owner-p4-projects@FreeBSD.ORG Tue Jul 1 11:40:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 509EF37B404; Tue, 1 Jul 2003 11:40:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBC3E37B401 for ; Tue, 1 Jul 2003 11:40:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AD254400E for ; Tue, 1 Jul 2003 11:40:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h61IeR0U089342 for ; Tue, 1 Jul 2003 11:40:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h61IeO0E089309 for perforce@freebsd.org; Tue, 1 Jul 2003 11:40:24 -0700 (PDT) Date: Tue, 1 Jul 2003 11:40:24 -0700 (PDT) Message-Id: <200307011840.h61IeO0E089309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 33938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 18:40:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=33938 Change 33938 by jhb@jhb_laptop on 2003/07/01 11:39:50 IFC @33935. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#58 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#47 integrate .. //depot/projects/smpng/sys/alpha/alpha/support.s#7 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#11 integrate .. //depot/projects/smpng/sys/alpha/isa/isa_dma.c#4 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#5 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#24 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#28 integrate .. //depot/projects/smpng/sys/conf/NOTES#47 integrate .. //depot/projects/smpng/sys/conf/files#80 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#14 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#29 integrate .. //depot/projects/smpng/sys/conf/options.i386#28 integrate .. //depot/projects/smpng/sys/conf/options.pc98#29 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#7 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#27 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#9 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#10 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#31 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#30 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#14 integrate .. //depot/projects/smpng/sys/dev/awi/awi_wep.c#11 integrate .. //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#8 integrate .. //depot/projects/smpng/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#10 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#5 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#4 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#15 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#23 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#16 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#20 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#10 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#10 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#20 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#39 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#9 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#11 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#11 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#5 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#7 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#3 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#4 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#10 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#16 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#28 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#13 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#9 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#15 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#10 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#35 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#14 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#52 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#19 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#18 integrate .. //depot/projects/smpng/sys/i386/include/bus_dma.h#7 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#20 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#48 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#28 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#11 integrate .. //depot/projects/smpng/sys/ia64/isa/isa_dma.c#4 integrate .. //depot/projects/smpng/sys/isa/psm.c#16 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#38 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#55 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#30 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#29 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/smpng/sys/modules/Makefile#56 integrate .. //depot/projects/smpng/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/umct/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_ieee80211.h#5 delete .. //depot/projects/smpng/sys/net/if_ieee80211subr.c#4 delete .. //depot/projects/smpng/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/smpng/sys/netipsec/key.c#4 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#9 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#55 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#31 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#27 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#29 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#11 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/gracklevar.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/hrowpicvar.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#40 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#28 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#31 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#8 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#17 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#5 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#8 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#11 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#1 branch .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#1 branch .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.h#1 branch .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#1 branch .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#24 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#9 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#52 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#39 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/sparcbus_if.m#3 delete .. //depot/projects/smpng/sys/sys/kse.h#11 integrate .. //depot/projects/smpng/sys/sys/mount.h#22 integrate .. //depot/projects/smpng/sys/sys/param.h#43 integrate .. //depot/projects/smpng/sys/sys/proc.h#93 integrate .. //depot/projects/smpng/sys/sys/smp.h#7 integrate .. //depot/projects/smpng/sys/sys/syscall.h#30 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#30 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#32 integrate .. //depot/projects/smpng/sys/vm/pmap.h#19 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#19 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#33 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.39 2003/06/27 08:31:47 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.40 2003/07/01 15:51:50 scottl Exp $"); #include #include @@ -64,6 +64,8 @@ int flags; int ref_count; int map_count; + bus_dma_lock_t *lockfunc; + void *lockfuncarg; }; struct bounce_page { @@ -94,7 +96,6 @@ vm_offset_t busaddress; /* address in bus space */ bus_dmamap_callback_t *callback; void *callback_arg; - struct mtx *callback_mtx; void *sgmaphandle; /* handle into sgmap */ STAILQ_ENTRY(bus_dmamap) links; }; @@ -129,6 +130,46 @@ return (retval); } +/* + * Convenience function for manipulating driver locks from busdma (during + * busdma_swi, for example). Drivers that don't provide their own locks + * should specify &Giant to dmat->lockfuncarg. Drivers that use their own + * non-mutex locking scheme don't have to use this at all. + */ +void +busdma_lock_mutex(void *arg, bus_dma_lock_op_t op) +{ + struct mtx *dmtx; + + dmtx = (struct mtx *)arg; + switch (op) { + case BUS_DMA_LOCK: + mtx_lock(dmtx); + break; + case BUS_DMA_UNLOCK: + mtx_unlock(dmtx); + break; + default: + panic("Unknown operation 0x%x for busdma_lock_mutex!", op); + } +} + +/* + * dflt_lock should never get called. It gets put into the dma tag when + * lockfunc == NULL, which is only valid if the maps that are associated + * with the tag are meant to never be defered. + * XXX Should have a way to identify which driver is responsible here. + */ +static void +dflt_lock(void *arg, bus_dma_lock_op_t op) +{ +#ifdef INVARIANTS + panic("driver error: busdma dflt_lock called"); +#else + printf("DRIVER_ERROR: busdma dflt_lock called\n"); +#endif +} + #define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 /* * Allocate a device specific dma_tag. @@ -138,7 +179,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat) + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error = 0; @@ -163,6 +205,13 @@ newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; + if (lockfunc != NULL) { + newtag->lockfunc = lockfunc; + newtag->lockfuncarg = lockfuncarg; + } else { + newtag->lockfunc = dflt_lock; + newtag->lockfuncarg = NULL; + } /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { @@ -926,18 +975,18 @@ void busdma_swi(void) { + bus_dma_tag_t dmat; struct bus_dmamap *map; mtx_lock(&bounce_lock); while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); - if (map->callback_mtx != NULL) - mtx_lock(map->callback_mtx); + dmat = map->dmat; + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); - if (map->callback_mtx != NULL) - mtx_unlock(map->callback_mtx); + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_UNLOCK); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#58 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.203 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.204 2003/06/28 06:34:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1462,6 +1462,25 @@ } /* + * Build siginfo_t for SA thread + */ +void +thread_siginfo(int sig, u_long code, siginfo_t *si) +{ + struct proc *p; + struct thread *td; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + + bzero(si, sizeof(*si)); + si->si_signo = sig; + si->si_code = code; + /* XXXKSE fill other fields */ +} + +/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#47 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.126 2003/06/18 02:57:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.128 2003/06/29 21:20:02 alc Exp $"); #include #include @@ -330,8 +330,6 @@ static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); @@ -1973,7 +1971,7 @@ * but is *MUCH* faster than pmap_enter... */ -static vm_page_t +vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { register pt_entry_t *pte; @@ -2090,18 +2088,18 @@ if (pmap == NULL || object == NULL) return; - + VM_OBJECT_LOCK(object); psize = alpha_btop(size); if ((object->type != OBJT_VNODE) || ((limit & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) && (object->resident_page_count > MAX_INIT_PT))) { - return; + goto unlock_return; } if (psize + pindex > object->size) { if (object->size < pindex) - return; + goto unlock_return; psize = object->size - pindex; } @@ -2141,8 +2139,10 @@ vm_page_deactivate(p); vm_page_busy(p); vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); mpte = pmap_enter_quick(pmap, addr + alpha_ptob(tmpidx), p, mpte); + VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); } @@ -2173,15 +2173,18 @@ vm_page_deactivate(p); vm_page_busy(p); vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); mpte = pmap_enter_quick(pmap, addr + alpha_ptob(tmpidx), p, mpte); + VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_wakeup(p); } vm_page_unlock_queues(); } } - return; +unlock_return: + VM_OBJECT_UNLOCK(object); } /* ==== //depot/projects/smpng/sys/alpha/alpha/support.s#7 (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/alpha/alpha/support.s,v 1.13 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.14 2003/06/29 17:14:42 marcel Exp $ */ /* @@ -84,7 +84,27 @@ mov zero, v0 RET END(suword) - + + LEAF(suword32, 2) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + stq t0, PCB_ONFAULT(t2) + + stl a1, 0(a0) /* try the store */ + + stq zero, PCB_ONFAULT(t2) /* clean up */ + + mov zero, v0 + RET + END(suword32) + LEAF(subyte, 1) LDGP(pv) @@ -130,6 +150,25 @@ RET END(fuword) + LEAF(fuword32, 1) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + stq t0, PCB_ONFAULT(t2) + + ldl v0, 0(a0) /* get the word containing our byte */ + + stq zero, PCB_ONFAULT(t2) /* clean up */ + + RET + END(fuword32) + LEAF(fubyte, 1) LDGP(pv) ==== //depot/projects/smpng/sys/alpha/include/bus.h#11 (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/alpha/include/bus.h,v 1.21 2003/05/30 20:40:32 hmp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.22 2003/07/01 15:51:50 scottl Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -523,6 +523,17 @@ typedef int bus_dma_filter_t(void *, bus_addr_t); /* + * A function that performs driver-specific syncronization on behalf of + * busdma. + */ +typedef enum { + BUS_DMA_LOCK = 0x01, + BUS_DMA_UNLOCK = 0x02, +} bus_dma_lock_op_t; + +typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); + +/* * Allocate a device specific dma_tag encapsulating the constraints of * the parent tag in addition to other restrictions specified: * @@ -547,7 +558,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filtfunc, void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat); int bus_dma_tag_destroy(bus_dma_tag_t dmat); @@ -629,4 +641,9 @@ if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) +/* + * Generic helper function for manipulating mutexes. + */ +void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); + #endif /* _ALPHA_BUS_H_ */ ==== //depot/projects/smpng/sys/alpha/isa/isa_dma.c#4 (text+ko) ==== @@ -48,11 +48,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.8 2003/06/10 16:57:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.9 2003/07/01 15:51:50 scottl Exp $"); #include #include #include +#include +#include #include #include #include @@ -131,6 +133,8 @@ /*maxsize*/bouncebufsize, /*nsegments*/1, /*maxsegz*/0x3ffff, /*flags*/BUS_DMA_ISA, + /*lockfunc*/busdma_lock_mutex, + /*lockarg*/&Giant, &dma_tag[chan]) != 0) { panic("isa_dmainit: unable to create dma tag\n"); } ==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.25 2003/06/10 17:02:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.26 2003/06/28 13:47:23 ticso Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include #include +#include #include #include "alphapci_if.h" @@ -387,43 +388,49 @@ } static int -mcpcia_setup_intr(device_t dev, device_t child, struct resource *ir, int flags, - driver_intr_t *intr, void *arg, void **cp) +mcpcia_pci_route_interrupt(device_t bus, device_t dev, int pin) { - struct mcpcia_softc *sc = MCPCIA_SOFTC(dev); - int slot, mid, gid, birq, irq, error, intpin, h; - - intpin = pci_get_intpin(child); - if (intpin == 0) { - /* No IRQ used */ - return (0); - } - if (intpin < 1 || intpin > 4) { - /* Bad IRQ */ - return (ENXIO); + int irq, slot, mid; + + /* + * Validate requested pin number. + */ + if ((pin < 1) || (pin > 4)) { + printf("mcpcia_pci_route_interrupt: bad interrupt pin %d\n", + pin); + return(255); } - slot = pci_get_slot(child); - mid = mcbus_get_mid(dev); - gid = mcbus_get_gid(dev); + slot = pci_get_slot(dev); + mid = mcbus_get_mid(bus); - if (slot == 0) { - device_t bdev; - /* bridged - get slot from grandparent */ - /* note that this is broken for all but the most trival case */ - bdev = device_get_parent(device_get_parent(child)); - slot = pci_get_slot(bdev); - } +#if 0 + printf("mcpcia_pci_route_interrupt: called for slot=%d, pin=%d, mid=%d\n", slot, pin, mid); +#endif if (mid == 5 && slot == 1) { irq = 16; /* MID 5, slot 1, is the internal NCR 53c810 */ } else if (slot >= 2 && slot <= 5) { - irq = ((slot - 2) * 4) + (intpin - 1); + irq = ((slot - 2) * 4) + (pin - 1); } else { - device_printf(child, "weird slot number (%d); can't make irq\n", + printf("mcpcia_pci_route_interrupt: weird device number %d\n", slot); - return (ENXIO); + return (255); } + + return(irq); +} + +static int +mcpcia_setup_intr(device_t dev, device_t child, struct resource *ir, int flags, + driver_intr_t *intr, void *arg, void **cp) +{ + struct mcpcia_softc *sc = MCPCIA_SOFTC(dev); + int mid, birq, irq, error, h; + + irq = ir->r_start; + mid = mcbus_get_mid(dev); + error = rman_activate_resource(ir); if (error) return error; @@ -437,8 +444,8 @@ } else { h = MCPCIA_VEC_PCI + ((mid - MCPCIA_PCI_MIDMIN) * MCPCIA_VECWIDTH_PER_MCPCIA) + - (slot * MCPCIA_VECWIDTH_PER_SLOT) + - ((intpin - 1) * MCPCIA_VECWIDTH_PER_INTPIN); + irq * MCPCIA_VECWIDTH_PER_INTPIN + + 2 * MCPCIA_VECWIDTH_PER_SLOT; } birq = irq + INTRCNT_KN300_IRQ; error = alpha_setup_intr(device_get_nameunit(child), h, @@ -449,8 +456,8 @@ mtx_lock_spin(&icu_lock); mcpcia_enable_intr(sc, irq); mtx_unlock_spin(&icu_lock); - device_printf(child, "interrupting at IRQ 0x%x int%c (vec 0x%x)\n", - irq, intpin - 1 + 'A' , h); + device_printf(child, "interrupting at IRQ 0x%x (vec 0x%x)\n", + irq , h); return (0); } @@ -458,30 +465,9 @@ mcpcia_teardown_intr(device_t dev, device_t child, struct resource *i, void *c) { struct mcpcia_softc *sc = MCPCIA_SOFTC(dev); - int slot, mid, intpin, irq; - intpin = pci_get_intpin(child); - if (intpin == 0) { - /* No IRQ used */ - return (0); - } - if (intpin < 1 || intpin > 4) { - /* Bad IRQ */ - return (ENXIO); - } - - slot = pci_get_slot(child); - mid = mcbus_get_mid(dev); - - if (mid == 5 && slot == 1) { - irq = 16; - } else if (slot >= 2 && slot <= 5) { - irq = ((slot - 2) << 4) + (intpin - 1); - } else { - return (ENXIO); - } mtx_lock_spin(&icu_lock); - mcpcia_disable_intr(sc, irq); + mcpcia_disable_intr(sc, i->r_start); mtx_unlock_spin(&icu_lock); alpha_teardown_intr(c); return (rman_deactivate_resource(i)); @@ -554,6 +540,11 @@ u_int32_t *dp, data, rvp; u_int64_t paddr; + if ((off == PCIR_INTLINE) && (sz == 1)) { + /* SRM left bad value; let intr_route fill them in later */ + return ~0; + } + rvp = data = ~0; /* @@ -789,7 +780,7 @@ DEVMETHOD(pcib_maxslots, mcpcia_maxslots), DEVMETHOD(pcib_read_config, mcpcia_read_config), DEVMETHOD(pcib_write_config, mcpcia_write_config), - DEVMETHOD(pcib_route_interrupt, alpha_pci_route_interrupt), + DEVMETHOD(pcib_route_interrupt, mcpcia_pci_route_interrupt), { 0, 0 } }; ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#3 (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/amd64/amd64/busdma_machdep.c,v 1.45 2003/05/27 04:59:56 scottl Exp $ + * $FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.48 2003/07/01 16:54:54 mux Exp $ */ #include @@ -62,6 +62,8 @@ int flags; int ref_count; int map_count; + bus_dma_lock_t *lockfunc; + void *lockfuncarg; }; struct bounce_page { @@ -135,6 +137,46 @@ return (retval); } +/* + * Convenience function for manipulating driver locks from busdma (during + * busdma_swi, for example). Drivers that don't provide their own locks + * should specify &Giant to dmat->lockfuncarg. Drivers that use their own + * non-mutex locking scheme don't have to use this at all. + */ +void +busdma_lock_mutex(void *arg, bus_dma_lock_op_t op) +{ + struct mtx *dmtx; + + dmtx = (struct mtx *)arg; + switch (op) { + case BUS_DMA_LOCK: + mtx_lock(dmtx); + break; + case BUS_DMA_UNLOCK: + mtx_unlock(dmtx); + break; + default: + panic("Unknown operation 0x%x for busdma_lock_mutex!", op); + } +} + +/* + * dflt_lock should never get called. It gets put into the dma tag when + * lockfunc == NULL, which is only valid if the maps that are associated + * with the tag are meant to never be defered. + * XXX Should have a way to identify which driver is responsible here. + */ +static void +dflt_lock(void *arg, bus_dma_lock_op_t op) +{ +#ifdef INVARIANTS + panic("driver error: busdma dflt_lock called"); +#else + printf("DRIVER_ERROR: busdma dflt_lock called\n"); +#endif +} + #define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 /* * Allocate a device specific dma_tag. @@ -144,7 +186,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat) + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error = 0; @@ -170,6 +213,13 @@ newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; + if (lockfunc != NULL) { + newtag->lockfunc = lockfunc; + newtag->lockfuncarg = lockfuncarg; + } else { + newtag->lockfunc = dflt_lock; + newtag->lockfuncarg = NULL; + } /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { @@ -766,7 +816,7 @@ M_NOWAIT, 0ul, dmat->lowaddr, PAGE_SIZE, - 0); + dmat->boundary); mtx_unlock(&Giant); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); @@ -861,14 +911,18 @@ void busdma_swi(void) { + bus_dma_tag_t dmat; struct bus_dmamap *map; mtx_lock(&bounce_lock); while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); + dmat = map->dmat; + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_UNLOCK); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.582 2003/05/31 07:00:08 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.583 2003/06/28 06:34:07 davidxu Exp $ */ #include "opt_atalk.h" @@ -300,6 +300,25 @@ } /* + * Build siginfo_t for SA thread + */ +void +thread_siginfo(int sig, u_long code, siginfo_t *si) +{ + struct proc *p; + struct thread *td; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + + bzero(si, sizeof(*si)); + si->si_signo = sig; + si->si_code = code; + /* XXXKSE fill other fields */ +} + +/* * System call to cleanup state after a signal * has been taken. Reset signal mask and * stack state from context left by sendsig (above). ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.417 2003/06/26 01:04:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.418 2003/06/29 21:20:03 alc Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -208,8 +208,6 @@ static void amd64_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 1 15:00:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29E8537B404; Tue, 1 Jul 2003 15:00:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D100737B401 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59B9443F75 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h61M0l0U057604 for ; Tue, 1 Jul 2003 15:00:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h61M0k7X057590 for perforce@freebsd.org; Tue, 1 Jul 2003 15:00:46 -0700 (PDT) Date: Tue, 1 Jul 2003 15:00:46 -0700 (PDT) Message-Id: <200307012200.h61M0k7X057590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 33949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 22:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=33949 Change 33949 by peter@peter_daintree on 2003/07/01 14:59:48 revert to vendor prior to integration Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#3 edit .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#4 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#3 (text+ko) ==== @@ -18,17 +18,3 @@ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_x86_64_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" - -X86_EMULATION= elf_i386_fbsd -_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\" -EMS+= ${X86_EMULATION} -LDSCRIPTS+= ${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \ - ${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc -SRCS+= e${X86_EMULATION}.c -CLEANFILES+= e${X86_EMULATION}.c - -e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ - ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}" ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#4 (text+ko) ==== @@ -1,22 +1,21 @@ # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ +.include "${.CURDIR}/Makefile.i386" + +# Get the i386 DEFAULT_VECTOR and VECS. +I386_VECS:= ${DEFAULT_VECTOR} ${VECS} + DEFAULT_VECTOR= bfd_elf64_x86_64_vec -VECS= bfd_elf64_x86_64_vec bfd_elf32_i386_freebsd_vec +VECS= bfd_elf64_x86_64_vec ${I386_VECS} SRCS+= elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c -SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c CLEANFILES+= elf64-target.h elf64-target.h: elfxx-target.h sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} -CLEANFILES+= elf32-target.h - -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - CLEANFILES+= elf64-amd64-fbsd.c elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c From owner-p4-projects@FreeBSD.ORG Tue Jul 1 15:02:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51D837B404; Tue, 1 Jul 2003 15:02:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7121A37B401 for ; Tue, 1 Jul 2003 15:02:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4BBD43FE9 for ; Tue, 1 Jul 2003 15:02:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h61M2q0U058985 for ; Tue, 1 Jul 2003 15:02:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h61M2o7k058951 for perforce@freebsd.org; Tue, 1 Jul 2003 15:02:50 -0700 (PDT) Date: Tue, 1 Jul 2003 15:02:50 -0700 (PDT) Message-Id: <200307012202.h61M2o7k058951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 33950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 22:02:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=33950 Change 33950 by peter@peter_daintree on 2003/07/01 15:02:30 IFC @33948 Affected files ... .. //depot/projects/hammer/Makefile.inc1#20 integrate .. //depot/projects/hammer/bin/cp/cp.c#8 integrate .. //depot/projects/hammer/bin/csh/Makefile#4 integrate .. //depot/projects/hammer/bin/ed/Makefile#5 integrate .. //depot/projects/hammer/bin/pwd/pwd.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/lukemftp/FreeBSD-patchset#2 integrate .. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#3 integrate .. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/hammer/etc/periodic/security/500.ipfwdenied#4 integrate .. //depot/projects/hammer/etc/periodic/security/510.ipfdenied#2 integrate .. //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#4 integrate .. //depot/projects/hammer/etc/periodic/security/600.ip6fwdenied#4 integrate .. //depot/projects/hammer/etc/periodic/security/650.ip6fwlimit#4 integrate .. //depot/projects/hammer/etc/periodic/security/security.functions#3 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#11 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#5 integrate .. //depot/projects/hammer/etc/rc.d/atm2.sh#4 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#4 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#6 integrate .. //depot/projects/hammer/etc/rc.d/ip6fw#3 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#6 integrate .. //depot/projects/hammer/etc/rc.d/motd#4 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#4 integrate .. //depot/projects/hammer/etc/rc.d/netif#2 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#2 integrate .. //depot/projects/hammer/etc/rc.d/network2#3 integrate .. //depot/projects/hammer/etc/rc.d/network3#4 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#5 integrate .. //depot/projects/hammer/etc/rc.d/routed#5 integrate .. //depot/projects/hammer/etc/rc.d/routing#2 integrate .. //depot/projects/hammer/gnu/lib/libg2c/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/doc/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f77doc/Makefile#2 integrate .. //depot/projects/hammer/include/Makefile#13 integrate .. //depot/projects/hammer/include/paths.h#6 integrate .. //depot/projects/hammer/include/unistd.h#9 integrate .. //depot/projects/hammer/lib/csu/amd64/Makefile#5 integrate .. //depot/projects/hammer/lib/libc/Makefile#7 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/exec.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/fmtcheck.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/setproctitle.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/scanf.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/alloca.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strmode.3#2 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#3 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#3 integrate .. //depot/projects/hammer/lib/libcompat/Makefile#3 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#9 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#2 integrate .. //depot/projects/hammer/lib/libpthread/support/thr_support.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_rtld.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_stack.c#3 integrate .. //depot/projects/hammer/lib/libstand/Makefile#6 integrate .. //depot/projects/hammer/lib/libthr/Makefile#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_gc.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#26 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#8 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/hw.ent#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#1 branch .. //depot/projects/hammer/rescue/Makefile#1 branch .. //depot/projects/hammer/rescue/README#1 branch .. //depot/projects/hammer/rescue/librescue/Makefile#1 branch .. //depot/projects/hammer/rescue/rescue/Makefile#1 branch .. //depot/projects/hammer/sbin/dhclient/Makefile#3 integrate .. //depot/projects/hammer/sbin/dhclient/client/Makefile#2 integrate .. //depot/projects/hammer/sbin/fsck/fsck.c#6 integrate .. //depot/projects/hammer/sbin/fsck/pathnames.h#2 delete .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/hammer/sbin/mdmfs/pathnames.h#3 delete .. //depot/projects/hammer/sbin/mount/mount.c#5 integrate .. //depot/projects/hammer/sbin/mount/pathnames.h#2 integrate .. //depot/projects/hammer/sbin/umount/umount.c#5 integrate .. //depot/projects/hammer/share/man/man4/aac.4#3 integrate .. //depot/projects/hammer/share/man/man4/aha.4#2 integrate .. //depot/projects/hammer/share/man/man4/ahb.4#2 integrate .. //depot/projects/hammer/share/man/man4/ahc.4#3 integrate .. //depot/projects/hammer/share/man/man4/ath.4#3 integrate .. //depot/projects/hammer/share/man/man4/atkbd.4#2 integrate .. //depot/projects/hammer/share/man/man4/awi.4#3 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#2 integrate .. //depot/projects/hammer/share/man/man4/blackhole.4#3 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#2 integrate .. //depot/projects/hammer/share/man/man4/bt.4#2 integrate .. //depot/projects/hammer/share/man/man4/cd.4#3 integrate .. //depot/projects/hammer/share/man/man4/ch.4#2 integrate .. //depot/projects/hammer/share/man/man4/da.4#3 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#2 integrate .. //depot/projects/hammer/share/man/man4/divert.4#2 integrate .. //depot/projects/hammer/share/man/man4/fpa.4#2 integrate .. //depot/projects/hammer/share/man/man4/icmp.4#3 integrate .. //depot/projects/hammer/share/man/man4/ifmib.4#3 integrate .. //depot/projects/hammer/share/man/man4/inet.4#4 integrate .. //depot/projects/hammer/share/man/man4/intro.4#4 integrate .. //depot/projects/hammer/share/man/man4/ip6.4#2 integrate .. //depot/projects/hammer/share/man/man4/kld.4#4 integrate .. //depot/projects/hammer/share/man/man4/lp.4#2 integrate .. //depot/projects/hammer/share/man/man4/lpt.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pae.4#4 integrate .. //depot/projects/hammer/share/man/man4/matcd.4#2 integrate .. //depot/projects/hammer/share/man/man4/mem.4#2 integrate .. //depot/projects/hammer/share/man/man4/mtio.4#2 integrate .. //depot/projects/hammer/share/man/man4/natm.4#3 integrate .. //depot/projects/hammer/share/man/man4/netgraph.4#3 integrate .. //depot/projects/hammer/share/man/man4/netintro.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_l2cap.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_ppp.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_socket.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_vjc.4#2 integrate .. //depot/projects/hammer/share/man/man4/pass.4#2 integrate .. //depot/projects/hammer/share/man/man4/pci.4#3 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#4 integrate .. //depot/projects/hammer/share/man/man4/polling.4#4 integrate .. //depot/projects/hammer/share/man/man4/ppi.4#2 integrate .. //depot/projects/hammer/share/man/man4/ppp.4#2 integrate .. //depot/projects/hammer/share/man/man4/psm.4#3 integrate .. //depot/projects/hammer/share/man/man4/pt.4#2 integrate .. //depot/projects/hammer/share/man/man4/pty.4#2 integrate .. //depot/projects/hammer/share/man/man4/route.4#2 integrate .. //depot/projects/hammer/share/man/man4/sa.4#2 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#3 integrate .. //depot/projects/hammer/share/man/man4/scsi.4#2 integrate .. //depot/projects/hammer/share/man/man4/si.4#2 integrate .. //depot/projects/hammer/share/man/man4/sio.4#4 integrate .. //depot/projects/hammer/share/man/man4/sl.4#2 integrate .. //depot/projects/hammer/share/man/man4/smp.4#4 integrate .. //depot/projects/hammer/share/man/man4/syncer.4#3 integrate .. //depot/projects/hammer/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/hammer/share/man/man4/termios.4#2 integrate .. //depot/projects/hammer/share/man/man4/ti.4#4 integrate .. //depot/projects/hammer/share/man/man4/ttcp.4#2 integrate .. //depot/projects/hammer/share/man/man4/tty.4#2 integrate .. //depot/projects/hammer/share/man/man4/udp.4#2 integrate .. //depot/projects/hammer/share/man/man4/urio.4#3 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/hammer/share/man/man5/style.Makefile.5#2 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#4 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#4 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#5 integrate .. //depot/projects/hammer/share/mk/sys.mk#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#3 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#9 integrate .. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#8 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#7 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/hammer/sys/boot/i386/btx/lib/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/lib/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/conf/files#21 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#4 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#10 integrate .. //depot/projects/hammer/sys/conf/options.i386#10 integrate .. //depot/projects/hammer/sys/conf/options.pc98#10 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#4 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#10 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#7 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#8 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#6 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#9 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#6 integrate .. //depot/projects/hammer/sys/dev/awi/awi_wep.c#4 integrate .. //depot/projects/hammer/sys/dev/awi/awi_wicfg.c#2 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#8 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#5 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_mca.c#4 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#13 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#12 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#14 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#11 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#16 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#5 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ida/ida.c#7 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#5 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#4 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#4 integrate .. //depot/projects/hammer/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#4 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#11 integrate .. //depot/projects/hammer/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/hammer/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#8 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#8 integrate .. //depot/projects/hammer/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/hammer/sys/i386/include/bus_dma.h#7 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#6 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#20 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#8 integrate .. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/hammer/sys/isa/psm.c#8 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#30 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#14 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#14 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#14 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/hammer/sys/modules/Makefile#21 integrate .. //depot/projects/hammer/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umct/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/hammer/sys/net/if_ieee80211.h#3 delete .. //depot/projects/hammer/sys/net/if_ieee80211subr.c#3 delete .. //depot/projects/hammer/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/hammer/sys/netipsec/key.c#3 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/hammer/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#15 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#13 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#10 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#14 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#6 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/gracklevar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/hrowpicvar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#11 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#4 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#5 integrate .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#1 branch .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#1 branch .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.h#1 branch .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#1 branch .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/sparcbus_if.m#3 delete .. //depot/projects/hammer/sys/sys/kse.h#11 integrate .. //depot/projects/hammer/sys/sys/mount.h#8 integrate .. //depot/projects/hammer/sys/sys/param.h#15 integrate .. //depot/projects/hammer/sys/sys/proc.h#27 integrate .. //depot/projects/hammer/sys/sys/smp.h#2 integrate .. //depot/projects/hammer/sys/sys/syscall.h#14 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#14 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#14 integrate .. //depot/projects/hammer/sys/vm/pmap.h#10 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#6 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#15 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#1 branch .. //depot/projects/hammer/tools/tools/README#4 integrate .. //depot/projects/hammer/tools/tools/ath/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats.c#1 branch .. //depot/projects/hammer/usr.bin/ee/ee.c#2 integrate .. //depot/projects/hammer/usr.bin/elfdump/elfdump.1#2 integrate .. //depot/projects/hammer/usr.bin/elfdump/elfdump.c#2 integrate .. //depot/projects/hammer/usr.bin/finger/finger.1#3 integrate .. //depot/projects/hammer/usr.bin/finger/finger.c#4 integrate .. //depot/projects/hammer/usr.bin/uname/uname.c#7 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#6 integrate .. //depot/projects/hammer/usr.bin/units/units.lib#2 integrate .. //depot/projects/hammer/usr.bin/w/w.c#3 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.h#3 integrate .. //depot/projects/hammer/usr.sbin/raycontrol/raycontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#6 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.368 2003/06/22 10:01:03 simokawa Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.372 2003/07/01 12:57:53 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -66,6 +66,9 @@ .if exists(${.CURDIR}/libexec) SUBDIR+= libexec .endif +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) +SUBDIR+= rescue +.endif .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif @@ -94,7 +97,7 @@ # rebuilt before you do them. .if defined(LOCAL_DIRS) .for _DIR in ${LOCAL_DIRS} -.if exists(${.CURDIR}/${_DIR}) & exists(${.CURDIR}/${_DIR}/Makefile) +.if exists(${.CURDIR}/${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif .endfor @@ -664,16 +667,31 @@ _yacc= usr.bin/yacc .endif +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ + ${BOOTSTRAPPING} < 501100 +_crunchgen= usr.sbin/crunch/crunchgen +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif bootstrap-tools: -.for _tool in ${_strfile} usr.bin/colldef \ - usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ - ${_xargs} usr.bin/xinstall ${_yacc} \ - usr.sbin/config ${_kbdcontrol} \ - ${_gperf} ${_groff} gnu/usr.bin/texinfo +.for _tool in \ + ${_strfile} \ + ${_gperf} \ + ${_groff} \ + gnu/usr.bin/texinfo \ + usr.bin/colldef \ + usr.bin/makewhatis \ + usr.bin/rpcgen \ + ${_uudecode} \ + ${_xargs} \ + usr.bin/xinstall \ + ${_yacc} \ + usr.sbin/config \ + ${_crunchgen} \ + ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -704,9 +722,18 @@ .endif build-tools: -.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \ - ${_libkrb5} lib/libncurses ${_share} \ - ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall +.for _tool in \ + bin/csh \ + bin/sh \ + gnu/usr.bin/cc/cc_tools \ + ${_fortran} \ + ${_libkrb5} \ + lib/libncurses \ + ${_share} \ + ${_aicasm} \ + usr.bin/awk \ + usr.bin/file \ + usr.sbin/sysinstall @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -716,32 +743,40 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_elf2exe= usr.sbin/elf2exe +.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ + ${BOOTSTRAPPING} < 500037 +_elf2aout= usr.bin/elf2aout .endif .if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_btxld= usr.sbin/btxld -.if defined(RELEASEDIR) -_kgzip= usr.sbin/kgzip +_btxld= usr.sbin/btxld .endif + +.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ + defined(RELEASEDIR)) && \ + ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) +_crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - ${BOOTSTRAPPING} < 500037 -_elf2aout= usr.bin/elf2aout +.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +_elf2exe= usr.sbin/elf2exe .endif -.if defined(RELEASEDIR) -_crunchide= usr.sbin/crunch/crunchide +.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ + defined(RELEASEDIR) +_kgzip= usr.sbin/kgzip .endif -_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint - cross-tools: -.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils ${_crunchide} \ - gnu/usr.bin/cc ${_xlint} ${_kgzip} +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc \ + ${_elf2aout} \ + usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ + ${_btxld} \ + ${_crunchide} \ + ${_elf2exe} \ + ${_kgzip} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/hammer/bin/cp/cp.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $"); /* * Cp copies source files to target files. @@ -366,7 +366,7 @@ * normally want to preserve them on directories. */ if (pflag) { - if (setfile(curr->fts_statp, 0)) + if (setfile(curr->fts_statp, -1)) rval = 1; } else { mode = curr->fts_statp->st_mode; ==== //depot/projects/hammer/bin/csh/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.32 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.33 2003/06/29 18:46:17 gordon Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -10,7 +10,11 @@ .PATH: ${TCSHDIR} PROG= csh +.if defined(RESCUE) +DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG}"' +.else DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' +.endif CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} WARNS= 2 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ ==== //depot/projects/hammer/bin/ed/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.25 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES WARNS= 2 ==== //depot/projects/hammer/bin/pwd/pwd.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.22 2003/06/30 17:05:40 kan Exp $"); #include #include @@ -108,7 +108,7 @@ static char * getcwd_logical(void) { - struct stat log, phy; + struct stat lg, phy; char *pwd; /* @@ -116,9 +116,9 @@ * the current working directory. */ if ((pwd = getenv("PWD")) != NULL && *pwd == '/') { - if (stat(pwd, &log) == -1 || stat(".", &phy) == -1) + if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1) return (NULL); - if (log.st_dev == phy.st_dev && log.st_ino == phy.st_ino) + if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino) return (pwd); } ==== //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * see ``http://www.vix.com''. To learn more about Nominum, Inc., see * ``http://www.nominum.com''. * - * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.5 2002/09/30 08:45:34 murray Exp $ + * $FreeBSD: src/contrib/isc-dhcp/includes/cf/freebsd.h,v 1.6 2003/06/29 18:46:17 gordon Exp $ */ #include @@ -103,6 +103,10 @@ #define SOCKLEN_T int #endif +#ifdef RESCUE +#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" +#endif + #if defined (USE_DEFAULT_NETWORK) # define USE_BPF #endif @@ -113,6 +117,9 @@ #endif /* HAVE_DEV_RANDOM */ const char *cmds[] = { +#ifndef RESCUE + /* rescue environment can't rely on these ... */ + /* Actually, /sbin/dhclient shouldn't use these, either. */ "/bin/ps -axlw 2>&1", "/usr/sbin/arp -an 2>&1", "/usr/bin/netstat -an 2>&1", @@ -123,10 +130,12 @@ "/usr/sbin/iostat 2>&1", "/usr/bin/vmstat 2>&1", "/usr/bin/w 2>&1", +#endif NULL }; const char *dirs[] = { +#ifndef RESCUE "/tmp", "/usr/tmp", ".", @@ -136,13 +145,16 @@ "/var/mail", "/home", "/usr/home", +#endif NULL }; const char *files[] = { +#ifndef RESCUE "/var/log/messages", "/var/log/wtmp", "/var/log/lastlog", +#endif NULL }; #endif /* NEED_PRAND_CONF */ ==== //depot/projects/hammer/contrib/lukemftp/FreeBSD-patchset#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include "progressbar.h" + -+#define SECSPERHOUR 60 ++#define SECSPERHOUR (60 * 60) +#define SECSPERDAY ((long)60 * 60 * 24) #if !defined(NO_PROGRESS) ==== //depot/projects/hammer/contrib/lukemftp/src/ftp.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $ +.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $ .\" .\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1030,7 +1030,7 @@ Answer .Sq yes , and transfer the file. -.It Cm ? +.It Cm \&? Display a help message. .El .Pp @@ -1433,7 +1433,7 @@ .It Ic xferbuf Ar size Set the size of the socket send and receive buffers to .Ar size . -.It Ic ? Op Ar command +.It Ic \&? Op Ar command A synonym for .Ic help . .El ==== //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ #include "progressbar.h" -#define SECSPERHOUR 60 +#define SECSPERHOUR (60 * 60) #define SECSPERDAY ((long)60 * 60 * 24) #if !defined(NO_PROGRESS) ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.62 2003/03/11 11:14:34 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.63 2003/06/29 18:35:36 gordon Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -63,6 +63,8 @@ .. proc mode=0555 .. + rescue + .. root .. sbin ==== //depot/projects/hammer/etc/periodic/security/500.ipfwdenied#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:" fi ==== //depot/projects/hammer/etc/periodic/security/510.ipfdenied#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.1 2002/10/25 15:16:54 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ipfdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ipfstat -nhio 2>/dev/null | grep block > ${TMP}; then check_diff new_only ipf ${TMP} "${host} ipf denied packets:" fi ==== //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $ # # Show ipfw rules which have reached the log limit @@ -42,7 +42,7 @@ case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then ipfw -a l | grep " log " | \ ==== //depot/projects/hammer/etc/periodic/security/600.ip6fwdenied#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:" fi ==== //depot/projects/hammer/etc/periodic/security/650.ip6fwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $ +# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $ # # Show ip6fw rules which have reached the log limit @@ -42,7 +42,7 @@ case "$daily_status_security_ip6fwlimit_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then ip6fw -a l | grep " log " | \ ==== //depot/projects/hammer/etc/periodic/security/security.functions#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $ # # @@ -52,7 +52,7 @@ msg="$1"; shift if [ "${tmpf}" = "-" ]; then - tmpf=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + tmpf=`mktemp -t security` cat > ${tmpf} fi ==== //depot/projects/hammer/etc/rc.d/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.20 2003/06/29 05:15:57 mtm Exp $ .include @@ -12,10 +12,10 @@ ldconfig local localdaemons lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ - named netif network1 network2 network3 \ + named netif netoptions network1 network2 network3 \ network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ - rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ + rarpd rcconf.sh root route6d routed routing rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ syslogd timed ttys usbd vinum virecover watchdogd ypbind \ yppasswdd ypserv ypset ypupdated ypxfrd ==== //depot/projects/hammer/etc/rc.d/NETWORKING#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.5 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.6 2003/06/29 05:15:57 mtm Exp $ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: network dhclient altqd netif network2 network_ipv6 isdnd ppp-user +# REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user # REQUIRE: routed mrouted route6d mroute6d >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 1 16:19:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 698FE37B404; Tue, 1 Jul 2003 16:19:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E59E437B401; Tue, 1 Jul 2003 16:19:40 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA7B444013; Tue, 1 Jul 2003 16:19:36 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (harmony.village.org [10.0.0.6]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h61NJYE1020053; Tue, 1 Jul 2003 17:19:35 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 01 Jul 2003 17:19:30 -0600 (MDT) Message-Id: <20030701.171930.73054075.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200306290551.h5T5phkC064100@repoman.freebsd.org> References: <200306290551.h5T5phkC064100@repoman.freebsd.org> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 33828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 23:19:42 -0000 In message: <200306290551.h5T5phkC064100@repoman.freebsd.org> Marcel Moolenaar writes: : New branch: uart Cool. I'm in Japan right now, but plan on integrating from this into a copy of the branch when I get back... Warner From owner-p4-projects@FreeBSD.ORG Tue Jul 1 19:35:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2978F37B404; Tue, 1 Jul 2003 19:35:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B594837B401 for ; Tue, 1 Jul 2003 19:35:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66B7C43FE9 for ; Tue, 1 Jul 2003 19:35:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h622ZT0U049537 for ; Tue, 1 Jul 2003 19:35:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h622ZQ86049534 for perforce@freebsd.org; Tue, 1 Jul 2003 19:35:26 -0700 (PDT) Date: Tue, 1 Jul 2003 19:35:26 -0700 (PDT) Message-Id: <200307020235.h622ZQ86049534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 02:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=33959 Change 33959 by marcel@marcel_nfs on 2003/07/01 19:34:54 IFC @33957 Affected files ... .. //depot/projects/ia64/Makefile.inc1#69 integrate .. //depot/projects/ia64/bin/cp/cp.c#14 integrate .. //depot/projects/ia64/bin/pwd/pwd.c#6 integrate .. //depot/projects/ia64/contrib/lukemftp/FreeBSD-patchset#2 integrate .. //depot/projects/ia64/contrib/lukemftp/src/ftp.1#5 integrate .. //depot/projects/ia64/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#5 integrate .. //depot/projects/ia64/etc/periodic/security/510.ipfdenied#2 integrate .. //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#6 integrate .. //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#5 integrate .. //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#6 integrate .. //depot/projects/ia64/etc/periodic/security/security.functions#3 integrate .. //depot/projects/ia64/etc/rc.d/initdiskless#8 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#7 integrate .. //depot/projects/ia64/etc/rc.d/motd#6 integrate .. //depot/projects/ia64/gnu/lib/libg2c/Makefile#4 integrate .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#17 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/f77doc/Makefile#3 integrate .. //depot/projects/ia64/include/unistd.h#18 integrate .. //depot/projects/ia64/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/ia64/lib/libc/Makefile#8 integrate .. //depot/projects/ia64/lib/libc/gen/exec.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/setproctitle.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strmode.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/mount.2#7 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#4 integrate .. //depot/projects/ia64/lib/libcompat/Makefile#3 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#9 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#22 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#14 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#7 integrate .. //depot/projects/ia64/lib/libstand/Makefile#14 integrate .. //depot/projects/ia64/lib/libthr/Makefile#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#3 integrate .. //depot/projects/ia64/sbin/umount/umount.c#7 integrate .. //depot/projects/ia64/share/man/man4/uscanner.4#4 integrate .. //depot/projects/ia64/share/man/man8/diskless.8#9 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/ia64/share/mk/bsd.dep.mk#10 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#22 integrate .. //depot/projects/ia64/share/mk/sys.mk#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#12 integrate .. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/ia64/sys/amd64/include/bus_dma.h#6 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/ia64/sys/boot/i386/btx/lib/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/lib/Makefile#4 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#31 integrate .. //depot/projects/ia64/sys/conf/options.sparc64#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#26 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#19 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#9 integrate .. //depot/projects/ia64/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#11 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#6 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#25 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#10 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#5 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#4 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#16 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#21 integrate .. //depot/projects/ia64/sys/dev/ct/ct_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#10 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#24 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#17 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#32 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#27 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#18 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#36 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#36 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#15 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#12 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#13 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#11 integrate .. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#5 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/iir/iir.c#7 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ips/ips.c#3 integrate .. //depot/projects/ia64/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/ia64/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_cbus.c#4 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx.c#10 integrate .. //depot/projects/ia64/sys/dev/mlx/mlx_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#15 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#25 integrate .. //depot/projects/ia64/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#14 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#13 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#11 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#16 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#12 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#38 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#38 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#13 integrate .. //depot/projects/ia64/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#42 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#21 integrate .. //depot/projects/ia64/sys/i386/include/bus_dma.h#8 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#15 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#13 integrate .. //depot/projects/ia64/sys/ia64/isa/isa_dma.c#5 integrate .. //depot/projects/ia64/sys/isa/psm.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#55 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/ia64/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#11 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#6 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#34 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#23 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#34 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#11 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#15 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#36 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#9 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#18 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_bus.h#5 integrate .. //depot/projects/ia64/sys/sparc64/isa/isa.c#8 integrate .. //depot/projects/ia64/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/ia64/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/ia64/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#12 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib.c#1 branch .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.c#1 branch .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.h#1 branch .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#1 branch .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#28 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#8 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#19 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_bus.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/sparcbus_if.m#3 delete .. //depot/projects/ia64/sys/sys/mount.h#21 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#14 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#58 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#50 integrate .. //depot/projects/ia64/usr.bin/ee/ee.c#5 integrate .. //depot/projects/ia64/usr.bin/uname/uname.c#8 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#12 integrate .. //depot/projects/ia64/usr.bin/units/units.lib#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#69 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.369 2003/06/28 04:46:45 smkelly Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.373 2003/07/01 23:10:39 gordon Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -66,6 +66,9 @@ .if exists(${.CURDIR}/libexec) SUBDIR+= libexec .endif +.if exists(${.CURDIR}/rescue) && defined(RESCUE) +SUBDIR+= rescue +.endif .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif @@ -664,16 +667,31 @@ _yacc= usr.bin/yacc .endif +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ + ${BOOTSTRAPPING} < 501100 +_crunchgen= usr.sbin/crunch/crunchgen +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif bootstrap-tools: -.for _tool in ${_strfile} usr.bin/colldef \ - usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ - ${_xargs} usr.bin/xinstall ${_yacc} \ - usr.sbin/config ${_kbdcontrol} \ - ${_gperf} ${_groff} gnu/usr.bin/texinfo +.for _tool in \ + ${_strfile} \ + ${_gperf} \ + ${_groff} \ + gnu/usr.bin/texinfo \ + usr.bin/colldef \ + usr.bin/makewhatis \ + usr.bin/rpcgen \ + ${_uudecode} \ + ${_xargs} \ + usr.bin/xinstall \ + ${_yacc} \ + usr.sbin/config \ + ${_crunchgen} \ + ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -704,9 +722,18 @@ .endif build-tools: -.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \ - ${_libkrb5} lib/libncurses ${_share} \ - ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall +.for _tool in \ + bin/csh \ + bin/sh \ + gnu/usr.bin/cc/cc_tools \ + ${_fortran} \ + ${_libkrb5} \ + lib/libncurses \ + ${_share} \ + ${_aicasm} \ + usr.bin/awk \ + usr.bin/file \ + usr.sbin/sysinstall @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -716,32 +743,40 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_elf2exe= usr.sbin/elf2exe +.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ + ${BOOTSTRAPPING} < 500037 +_elf2aout= usr.bin/elf2aout .endif .if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_btxld= usr.sbin/btxld -.if defined(RELEASEDIR) -_kgzip= usr.sbin/kgzip +_btxld= usr.sbin/btxld .endif + +.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ + defined(RELEASEDIR)) && \ + ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) +_crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - ${BOOTSTRAPPING} < 500037 -_elf2aout= usr.bin/elf2aout +.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +_elf2exe= usr.sbin/elf2exe .endif -.if defined(RELEASEDIR) -_crunchide= usr.sbin/crunch/crunchide +.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ + defined(RELEASEDIR) +_kgzip= usr.sbin/kgzip .endif -_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint - cross-tools: -.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils ${_crunchide} \ - gnu/usr.bin/cc ${_xlint} ${_kgzip} +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc \ + ${_elf2aout} \ + usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ + ${_btxld} \ + ${_crunchide} \ + ${_elf2exe} \ + ${_kgzip} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64/bin/cp/cp.c#14 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $"); /* * Cp copies source files to target files. @@ -366,7 +366,7 @@ * normally want to preserve them on directories. */ if (pflag) { - if (setfile(curr->fts_statp, 0)) + if (setfile(curr->fts_statp, -1)) rval = 1; } else { mode = curr->fts_statp->st_mode; ==== //depot/projects/ia64/bin/pwd/pwd.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.22 2003/06/30 17:05:40 kan Exp $"); #include #include @@ -108,7 +108,7 @@ static char * getcwd_logical(void) { - struct stat log, phy; + struct stat lg, phy; char *pwd; /* @@ -116,9 +116,9 @@ * the current working directory. */ if ((pwd = getenv("PWD")) != NULL && *pwd == '/') { - if (stat(pwd, &log) == -1 || stat(".", &phy) == -1) + if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1) return (NULL); - if (log.st_dev == phy.st_dev && log.st_ino == phy.st_ino) + if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino) return (pwd); } ==== //depot/projects/ia64/contrib/lukemftp/FreeBSD-patchset#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include "progressbar.h" + -+#define SECSPERHOUR 60 ++#define SECSPERHOUR (60 * 60) +#define SECSPERDAY ((long)60 * 60 * 24) #if !defined(NO_PROGRESS) ==== //depot/projects/ia64/contrib/lukemftp/src/ftp.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $ +.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $ .\" .\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1030,7 +1030,7 @@ Answer .Sq yes , and transfer the file. -.It Cm ? +.It Cm \&? Display a help message. .El .Pp @@ -1433,7 +1433,7 @@ .It Ic xferbuf Ar size Set the size of the socket send and receive buffers to .Ar size . -.It Ic ? Op Ar command +.It Ic \&? Op Ar command A synonym for .Ic help . .El ==== //depot/projects/ia64/contrib/lukemftp/src/progressbar.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ #include "progressbar.h" -#define SECSPERHOUR 60 +#define SECSPERHOUR (60 * 60) #define SECSPERDAY ((long)60 * 60 * 24) #if !defined(NO_PROGRESS) ==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:" fi ==== //depot/projects/ia64/etc/periodic/security/510.ipfdenied#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.1 2002/10/25 15:16:54 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ipfdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ipfstat -nhio 2>/dev/null | grep block > ${TMP}; then check_diff new_only ipf ${TMP} "${host} ipf denied packets:" fi ==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $ # # Show ipfw rules which have reached the log limit @@ -42,7 +42,7 @@ case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then ipfw -a l | grep " log " | \ ==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $ # # If there is a global system configuration file, suck it in. @@ -41,7 +41,7 @@ case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:" fi ==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $ +# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $ # # Show ip6fw rules which have reached the log limit @@ -42,7 +42,7 @@ case "$daily_status_security_ip6fwlimit_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + TMP=`mktemp -t security` IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then ip6fw -a l | grep " log " | \ ==== //depot/projects/ia64/etc/periodic/security/security.functions#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $ # # @@ -52,7 +52,7 @@ msg="$1"; shift if [ "${tmpf}" = "-" ]; then - tmpf=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` + tmpf=`mktemp -t security` cat > ${tmpf} fi ==== //depot/projects/ia64/etc/rc.d/initdiskless#8 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.23 2003/02/15 16:29:20 jhay Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.24 2003/06/30 21:47:06 brooks Exp $ # # PROVIDE: initdiskless # KEYWORD: FreeBSD @@ -149,6 +149,17 @@ done echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}" +# Figure out our NFS root path +# +set `mount -t nfs` +while [ $# -ge 1 ] ; do + if [ "$2" = "on" -a "$3" = "/" ]; then + nfsroot="$1" + break + fi + shift +done + # Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca}, # and /conf/${bootp_ipa}. For each subdirectory found within these # directories: @@ -164,6 +175,10 @@ # might contain 'myserver:/etc'. NFS remounts allow you to avoid # having to dup your system directories in /conf. Your server must # be sure to export those filesystems -alldirs, however. +# If the diskless_remount file contains a string beginning with a +# '/' it is assumed that the local nfsroot should be prepended to +# it before attemping to the remount. This allows the root to be +# relocated without needing to change the remount files. # for i in base default ${bootp_ipbca} ${bootp_ipa} ; do for j in /conf/$i/* ; do @@ -178,6 +193,9 @@ # if [ -d $j -a -f $j/diskless_remount ]; then nfspt=`/bin/cat $j/diskless_remount` + if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then + nfspt="${nfsroot}${nfspt}" + fi mount_nfs $nfspt $j chkerr $? "mount_nfs $nfspt $j" fi ==== //depot/projects/ia64/etc/rc.d/ldconfig#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.7 2003/06/30 15:02:05 trhodes Exp $ # # PROVIDE: ldconfig @@ -25,8 +25,8 @@ checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then _LDC=/usr/lib - for i in ${ldconfig_paths}; do - if [ -d "${i}" ]; then + for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do + if [ -r "${i}" ]; then _LDC="${_LDC} ${i}" fi done @@ -39,8 +39,8 @@ # Default the a.out ldconfig path. : ${ldconfig_paths_aout=${ldconfig_paths}} _LDC=/usr/lib/aout - for i in ${ldconfig_paths_aout}; do - if [ -d "${i}" ]; then + for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do + if [ -r "${i}" ]; then _LDC="${_LDC} ${i}" fi done ==== //depot/projects/ia64/etc/rc.d/motd#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.6 2003/06/30 22:06:26 mtm Exp $ # # PROVIDE: motd @@ -38,7 +38,7 @@ case ${OSTYPE} in FreeBSD) - T=`mktemp /tmp/_motd.XXXXXX` + T=`mktemp -t motd` uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T} awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} ;; ==== //depot/projects/ia64/gnu/lib/libg2c/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.10 2002/09/28 00:25:27 peter Exp $ +# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.11 2003/06/30 19:11:20 ru Exp $ SRCDIR= ${.CURDIR}/../../../contrib/libf2c @@ -98,22 +98,16 @@ ${E77OBJS}: f2cext.c ${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .if !defined(NOPIC) ${E77OBJS:.o=.So}: f2cext.c ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \ ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif .if !defined(NOPROFILE) ${E77OBJS:.o=.po}: f2cext.c ${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif INCS= g2c.h ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.48 2003/06/13 22:07:39 peter Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.49 2003/06/30 19:11:20 ru Exp $ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -37,7 +37,6 @@ CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. -LDFLAGS= -nostdlib OBJS= # added to below in various ways depending on TARGET_ARCH @@ -190,21 +189,15 @@ ${OBJS_T}: libgcc2.c ${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .if !defined(NOPIC) ${OBJS_S}: libgcc2.c ${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif .if !defined(NOPROFILE) ${OBJS_P}: libgcc2.c ${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif .if defined(LIB1ASMSRC) @@ -212,23 +205,17 @@ ${ASM_T}: ${_lib1asmsrc} ${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} ${.ALLSRC:N*.h} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .if !defined(NOPIC) ${ASM_S}: ${_lib1asmsrc} ${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} ${.ALLSRC:N*.h} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif .if !defined(NOPROFILE) ${ASM_P}: ${_lib1asmsrc} ${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \ -o ${.TARGET} ${.ALLSRC:N*.h} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} .endif .endfor .endif ==== //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.16 2003/02/25 15:41:49 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.17 2003/07/01 14:04:08 ru Exp $ .include "../Makefile.inc0" @@ -7,12 +7,11 @@ .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi -INFO = as ld annotate gasp gdb gdbint stabs binutils +INFO = as ld gasp gdb gdbint stabs binutils INFOSECTION= "Programming & development tools." INFOENTRY_as= "* As: (as). The GNU assembler." INFOENTRY_gasp= "* Gasp: (gasp). The GNU Assembler Macro Preprocessor." INFOENTRY_ld= "* Ld: (ld). The GNU linker." -INFOENTRY_annotate= "* GDB annotation: (annotate). Annotations for the GNU Debugger (GDB)." INFOENTRY_binutils= "* Binutils: (binutils). The GNU Binary Utilities." MAKEINFOFLAGS+= --no-validate ==== //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.amd64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.2 2003/07/01 17:12:55 obrien Exp $ TARGET_TUPLE?= x86_64-obrien-freebsd @@ -18,3 +18,17 @@ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_x86_64_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" + +X86_EMULATION= elf_i386_fbsd +_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\" +EMS+= ${X86_EMULATION} +LDSCRIPTS+= ${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \ + ${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc +SRCS+= e${X86_EMULATION}.c +CLEANFILES+= e${X86_EMULATION}.c + +e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ + genscripts.sh stringify.sed + sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ + ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ + "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}" ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.2 2003/07/01 17:29:48 obrien Exp $ .include "${.CURDIR}/Makefile.i386" # Get the i386 DEFAULT_VECTOR and VECS. -I386_VECS:= ${DEFAULT_VECTOR} ${VECS} +I386_VECS:= ${DEFAULT_VECTOR} # ${VECS} DEFAULT_VECTOR= bfd_elf64_x86_64_vec ==== //depot/projects/ia64/gnu/usr.bin/cc/f77doc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.4 2002/05/10 08:54:48 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.5 2003/07/01 14:46:26 ru Exp $ .include "../Makefile.inc" @@ -7,6 +7,7 @@ INFO= g77 MAKEINFOFLAGS+= -I ${GCCDIR}/f -I ${GCCDIR}/doc/include +MAKEINFOFLAGS+= -D "srcdir src/contrib" g77.info: g77.texi intdoc.texi ffe.texi invoke.texi news.texi bugs.texi \ ../doc/include/gpl.texi ../doc/include/fdl.texi ../doc/include/funding.texi ==== //depot/projects/ia64/include/unistd.h#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.67 2003/06/29 17:33:34 gordon Exp $ + * $FreeBSD: src/include/unistd.h,v 1.68 2003/07/01 12:09:06 bde Exp $ */ #ifndef _UNISTD_H_ @@ -335,7 +335,6 @@ int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); -int execvP(const char *, const char *, char * const *); pid_t fork(void); long fpathconf(int, int); char *getcwd(char *, size_t); @@ -471,6 +470,7 @@ int des_setkey(const char *key); void endusershell(void); int exect(const char *, char * const *, char * const *); +int execvP(const char *, const char *, char * const *); char *fflagstostr(u_long); int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); ==== //depot/projects/ia64/lib/csu/amd64/Makefile#2 (text+ko) ==== @@ -1,14 +1,12 @@ -# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.17 2002/07/29 09:40:11 ru Exp $ +# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $ .PATH: ${.CURDIR}/../common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o -CFLAGS+= -elf -Wall \ - -I${.CURDIR}/../common \ +CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -LDFLAGS+= -elf all: ${OBJS} ==== //depot/projects/ia64/lib/libc/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.40 2003/03/13 18:55:14 obrien Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.41 2003/07/01 15:07:01 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,8 +10,8 @@ # system call stubs. LIB=c SHLIB_MAJOR= 5 -AINC= -I${.CURDIR}/${MACHINE_ARCH} -CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include ${AINC} +CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include +CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes ==== //depot/projects/ia64/lib/libc/gen/exec.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.21 2003/06/29 17:33:34 gordon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $"); #include "namespace.h" #include @@ -142,14 +142,15 @@ } int -execvp(const char *name, char *const *argv) +execvp(const char *name, char * const *argv) { const char *path; /* Get the path we're searching. */ - if (!(path = getenv("PATH"))) + if ((path = getenv("PATH")) == NULL) path = _PATH_DEFPATH; - return(execvP(name,path,argv)); + + return (execvP(name, path, argv)); } int @@ -187,12 +188,12 @@ return (-1); } strcpy(cur, path); - while ( (p = strsep(&cur, ":")) ) { + while ((p = strsep(&cur, ":")) != NULL) { /* * It's a SHELL path -- double, leading and trailing colons * mean the current directory. */ - if (!*p) { + if (*p == '\0') { p = "."; lp = 1; } else @@ -217,7 +218,7 @@ buf[lp + ln + 1] = '\0'; retry: (void)_execve(bp, argv, environ); - switch(errno) { + switch (errno) { case E2BIG: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 1 19:47:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3081F37B404; Tue, 1 Jul 2003 19:47:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7DDB37B401 for ; Tue, 1 Jul 2003 19:47:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A843E43F93 for ; Tue, 1 Jul 2003 19:47:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h622lk0U052549 for ; Tue, 1 Jul 2003 19:47:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h622ljhJ052537 for perforce@freebsd.org; Tue, 1 Jul 2003 19:47:45 -0700 (PDT) Date: Tue, 1 Jul 2003 19:47:45 -0700 (PDT) Message-Id: <200307020247.h622ljhJ052537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 33961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 02:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=33961 Change 33961 by marcel@marcel_nfs on 2003/07/01 19:46:59 IFC @33957 Affected files ... .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/uart/alpha/include/bus.h#2 integrate .. //depot/projects/uart/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/uart/amd64/include/bus_dma.h#2 integrate .. //depot/projects/uart/boot/ficl/Makefile#2 integrate .. //depot/projects/uart/boot/forth/loader.conf#2 integrate .. //depot/projects/uart/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/uart/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/uart/conf/files.sparc64#3 integrate .. //depot/projects/uart/conf/options.sparc64#2 integrate .. //depot/projects/uart/dev/aac/aac.c#2 integrate .. //depot/projects/uart/dev/aac/aac_pci.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/uart/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/uart/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/uart/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/uart/dev/advansys/advansys.c#2 integrate .. //depot/projects/uart/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/uart/dev/advansys/adwcam.c#2 integrate .. //depot/projects/uart/dev/aha/aha.c#2 integrate .. //depot/projects/uart/dev/aha/aha_isa.c#2 integrate .. //depot/projects/uart/dev/aha/aha_mca.c#2 integrate .. //depot/projects/uart/dev/ahb/ahb.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/uart/dev/amd/amd.c#2 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#2 integrate .. //depot/projects/uart/dev/an/if_an_pci.c#2 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#2 integrate .. //depot/projects/uart/dev/ath/if_ath.c#2 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/uart/dev/ciss/ciss.c#2 integrate .. //depot/projects/uart/dev/ct/ct_isa.c#2 integrate .. //depot/projects/uart/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/uart/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/uart/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/uart/dev/em/if_em.c#2 integrate .. //depot/projects/uart/dev/en/midway.c#2 integrate .. //depot/projects/uart/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/uart/dev/firewire/firewire.c#2 integrate .. //depot/projects/uart/dev/firewire/fwdma.c#2 integrate .. //depot/projects/uart/dev/firewire/fwmem.c#2 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#2 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/uart/dev/firewire/sbp.c#2 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/uart/dev/gem/if_gem.c#2 integrate .. //depot/projects/uart/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/uart/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/uart/dev/hme/if_hme.c#2 integrate .. //depot/projects/uart/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/uart/dev/ida/ida.c#2 integrate .. //depot/projects/uart/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/uart/dev/ida/ida_pci.c#2 integrate .. //depot/projects/uart/dev/iir/iir.c#2 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#2 integrate .. //depot/projects/uart/dev/ips/ips.c#2 integrate .. //depot/projects/uart/dev/ips/ips_commands.c#2 integrate .. //depot/projects/uart/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/uart/dev/ips/ips_pci.c#2 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#2 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/uart/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/uart/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/uart/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/uart/dev/mlx/mlx.c#2 integrate .. //depot/projects/uart/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/uart/dev/mly/mly.c#2 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/uart/dev/pci/pci.c#2 integrate .. //depot/projects/uart/dev/pci/pci_if.m#2 integrate .. //depot/projects/uart/dev/pci/pci_private.h#2 integrate .. //depot/projects/uart/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/uart/dev/sound/isa/ess.c#2 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#2 integrate .. //depot/projects/uart/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/uart/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/uart/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/uart/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/uart/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/uart/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/uart/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/uart/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/uart/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#2 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/uart/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#2 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/uart/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/uart/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/uart/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/uart/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/uart/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/uart/dev/trm/trm.c#2 integrate .. //depot/projects/uart/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/uart/dev/tx/if_tx.c#2 integrate .. //depot/projects/uart/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/uart/dev/usb/usbdevs#2 integrate .. //depot/projects/uart/dev/usb/usbdevs.h#2 integrate .. //depot/projects/uart/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/uart/dev/usb/uscanner.c#2 integrate .. //depot/projects/uart/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/uart/dev/wds/wd7000.c#2 integrate .. //depot/projects/uart/dev/wi/if_wi.c#3 integrate .. //depot/projects/uart/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/uart/i386/include/bus_dma.h#2 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/uart/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/uart/ia64/include/bus.h#2 integrate .. //depot/projects/uart/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/uart/isa/psm.c#2 integrate .. //depot/projects/uart/kern/kern_condvar.c#2 integrate .. //depot/projects/uart/kern/kern_intr.c#2 integrate .. //depot/projects/uart/kern/kern_thread.c#2 integrate .. //depot/projects/uart/kern/vfs_mount.c#2 integrate .. //depot/projects/uart/modules/ath_hal/Makefile#2 integrate .. //depot/projects/uart/netipsec/ipsec_output.c#2 integrate .. //depot/projects/uart/netipsec/xform_ah.c#2 integrate .. //depot/projects/uart/netipsec/xform_esp.c#2 integrate .. //depot/projects/uart/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/uart/opencrypto/crypto.c#2 integrate .. //depot/projects/uart/opencrypto/cryptodev.h#2 integrate .. //depot/projects/uart/pci/if_rl.c#3 integrate .. //depot/projects/uart/pci/if_sis.c#2 integrate .. //depot/projects/uart/pci/if_xl.c#2 integrate .. //depot/projects/uart/powerpc/include/bus.h#2 integrate .. //depot/projects/uart/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#2 integrate .. //depot/projects/uart/sparc64/conf/NOTES#2 integrate .. //depot/projects/uart/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/uart/sparc64/include/bus.h#2 integrate .. //depot/projects/uart/sparc64/include/ofw_bus.h#2 integrate .. //depot/projects/uart/sparc64/isa/isa.c#2 integrate .. //depot/projects/uart/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/uart/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/uart/sparc64/pci/apb.c#2 integrate .. //depot/projects/uart/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/uart/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/uart/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/uart/sparc64/pci/ofw_pcib.c#1 branch .. //depot/projects/uart/sparc64/pci/ofw_pcib_subr.c#1 branch .. //depot/projects/uart/sparc64/pci/ofw_pcib_subr.h#1 branch .. //depot/projects/uart/sparc64/pci/ofw_pcibus.c#1 branch .. //depot/projects/uart/sparc64/pci/psycho.c#2 integrate .. //depot/projects/uart/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/uart/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/uart/sparc64/sparc64/ofw_bus.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/sparcbus_if.m#2 delete .. //depot/projects/uart/sys/mount.h#2 integrate .. //depot/projects/uart/vm/vm_contig.c#2 integrate .. //depot/projects/uart/vm/vm_map.c#3 integrate .. //depot/projects/uart/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.39 2003/06/27 08:31:47 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.42 2003/07/01 21:20:51 mux Exp $"); #include #include @@ -64,6 +64,8 @@ int flags; int ref_count; int map_count; + bus_dma_lock_t *lockfunc; + void *lockfuncarg; }; struct bounce_page { @@ -94,7 +96,6 @@ vm_offset_t busaddress; /* address in bus space */ bus_dmamap_callback_t *callback; void *callback_arg; - struct mtx *callback_mtx; void *sgmaphandle; /* handle into sgmap */ STAILQ_ENTRY(bus_dmamap) links; }; @@ -105,12 +106,21 @@ static void init_bounce_pages(void *dummy); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); -static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map); -static vm_offset_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, +static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, + int commit); +static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr, bus_size_t size); static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage); static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); +/* + * Return true if a match is made. + * + * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. + * + * If paddr is within the bounds of the dma tag then call the filter callback + * to check for a match, if there is no filter callback then assume a match. + */ static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) { @@ -129,6 +139,46 @@ return (retval); } +/* + * Convenience function for manipulating driver locks from busdma (during + * busdma_swi, for example). Drivers that don't provide their own locks + * should specify &Giant to dmat->lockfuncarg. Drivers that use their own + * non-mutex locking scheme don't have to use this at all. + */ +void +busdma_lock_mutex(void *arg, bus_dma_lock_op_t op) +{ + struct mtx *dmtx; + + dmtx = (struct mtx *)arg; + switch (op) { + case BUS_DMA_LOCK: + mtx_lock(dmtx); + break; + case BUS_DMA_UNLOCK: + mtx_unlock(dmtx); + break; + default: + panic("Unknown operation 0x%x for busdma_lock_mutex!", op); + } +} + +/* + * dflt_lock should never get called. It gets put into the dma tag when + * lockfunc == NULL, which is only valid if the maps that are associated + * with the tag are meant to never be defered. + * XXX Should have a way to identify which driver is responsible here. + */ +static void +dflt_lock(void *arg, bus_dma_lock_op_t op) +{ +#ifdef INVARIANTS + panic("driver error: busdma dflt_lock called"); +#else + printf("DRIVER_ERROR: busdma dflt_lock called\n"); +#endif +} + #define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 /* * Allocate a device specific dma_tag. @@ -138,7 +188,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat) + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error = 0; @@ -163,6 +214,13 @@ newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; + if (lockfunc != NULL) { + newtag->lockfunc = lockfunc; + newtag->lockfuncarg = lockfuncarg; + } else { + newtag->lockfunc = dflt_lock; + newtag->lockfuncarg = NULL; + } /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { @@ -233,8 +291,14 @@ atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { free(dmat, M_DEVBUF); - } - dmat = parent; + /* + * Last reference count, so + * release our reference + * count on our parent. + */ + dmat = parent; + } else + dmat = NULL; } } return (0); @@ -330,16 +394,10 @@ sgmap_free_region(chipset.sgmap, map->sgmaphandle); } - if (map != NULL) { + if (map != NULL && map != &nobounce_dmamap) { if (STAILQ_FIRST(&map->bpages) != NULL) return (EBUSY); - /* - * The nobounce_dmamap map is not dynamically - * allocated, thus we should on no account try to - * free it. - */ - if (map != &nobounce_dmamap) - free(map, M_DEVBUF); + free(map, M_DEVBUF); } dmat->map_count--; return (0); @@ -381,7 +439,7 @@ /* * Free a piece of memory and it's allociated dmamap, that was allocated - * via bus_dmamem_alloc. + * via bus_dmamem_alloc. Make the same choice for free/contigfree. */ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) @@ -476,18 +534,24 @@ /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { mtx_lock(&bounce_lock); - if (reserve_bounce_pages(dmat, map) != 0) { - - /* Queue us for resources */ - map->dmat = dmat; - map->buf = buf; - map->buflen = buflen; - map->callback = callback; - map->callback_arg = callback_arg; - - STAILQ_INSERT_TAIL(&bounce_map_waitinglist, map, links); - mtx_unlock(&bounce_lock); - return (EINPROGRESS); + if (flags & BUS_DMA_NOWAIT) { + if (reserve_bounce_pages(dmat, map, 0) != 0) { + mtx_unlock(&bounce_lock); + return (ENOMEM); + } + } else { + if (reserve_bounce_pages(dmat, map, 1) != 0) { + /* Queue us for resources */ + map->dmat = dmat; + map->buf = buf; + map->buflen = buflen; + map->callback = callback; + map->callback_arg = callback_arg; + STAILQ_INSERT_TAIL(&bounce_map_waitinglist, + map, links); + mtx_unlock(&bounce_lock); + return (EINPROGRESS); + } } mtx_unlock(&bounce_lock); } @@ -570,7 +634,7 @@ pmap = NULL; lastaddr = *lastaddrp; - bmask = ~(dmat->boundary - 1); + bmask = ~(dmat->boundary - 1); for (seg = *segp; buflen > 0 ; ) { /* @@ -657,7 +721,7 @@ error = 0; if (m0->m_pkthdr.len <= dmat->maxsize) { int first = 1; - vm_offset_t lastaddr = 0; + bus_addr_t lastaddr = 0; struct mbuf *m; for (m = m0; m != NULL && error == 0; m = m->m_next) { @@ -693,7 +757,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + bus_addr_t lastaddr; #ifdef __GNUC__ bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -776,7 +840,6 @@ struct bounce_page *bpage; if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - /* * Handle data bouncing. We might also * want to add support for invalidating @@ -838,7 +901,7 @@ PAGE_SIZE, dmat->boundary); mtx_unlock(&Giant); - if (bpage->vaddr == NULL) { + if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; } @@ -855,12 +918,14 @@ } static int -reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map) +reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit) { int pages; mtx_assert(&bounce_lock, MA_OWNED); pages = MIN(free_bpages, map->pagesneeded - map->pagesreserved); + if (commit == 0 && map->pagesneeded > (map->pagesreserved + pages)) + return (map->pagesneeded - (map->pagesreserved + pages)); free_bpages -= pages; reserved_bpages += pages; map->pagesreserved += pages; @@ -869,7 +934,7 @@ return (pages); } -static vm_offset_t +static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr, bus_size_t size) { @@ -912,7 +977,7 @@ free_bpages++; active_bpages--; if ((map = STAILQ_FIRST(&bounce_map_waitinglist)) != NULL) { - if (reserve_bounce_pages(map->dmat, map) == 0) { + if (reserve_bounce_pages(map->dmat, map, 1) == 0) { STAILQ_REMOVE_HEAD(&bounce_map_waitinglist, links); STAILQ_INSERT_TAIL(&bounce_map_callbacklist, map, links); @@ -926,18 +991,18 @@ void busdma_swi(void) { + bus_dma_tag_t dmat; struct bus_dmamap *map; mtx_lock(&bounce_lock); while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); - if (map->callback_mtx != NULL) - mtx_lock(map->callback_mtx); + dmat = map->dmat; + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); - if (map->callback_mtx != NULL) - mtx_unlock(map->callback_mtx); + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_UNLOCK); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/uart/alpha/include/bus.h#2 (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/alpha/include/bus.h,v 1.21 2003/05/30 20:40:32 hmp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.22 2003/07/01 15:51:50 scottl Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -523,6 +523,17 @@ typedef int bus_dma_filter_t(void *, bus_addr_t); /* + * A function that performs driver-specific syncronization on behalf of + * busdma. + */ +typedef enum { + BUS_DMA_LOCK = 0x01, + BUS_DMA_UNLOCK = 0x02, +} bus_dma_lock_op_t; + +typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); + +/* * Allocate a device specific dma_tag encapsulating the constraints of * the parent tag in addition to other restrictions specified: * @@ -547,7 +558,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filtfunc, void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat); int bus_dma_tag_destroy(bus_dma_tag_t dmat); @@ -629,4 +641,9 @@ if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) +/* + * Generic helper function for manipulating mutexes. + */ +void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); + #endif /* _ALPHA_BUS_H_ */ ==== //depot/projects/uart/alpha/isa/isa_dma.c#2 (text+ko) ==== @@ -48,11 +48,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.8 2003/06/10 16:57:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.9 2003/07/01 15:51:50 scottl Exp $"); #include #include #include +#include +#include #include #include #include @@ -131,6 +133,8 @@ /*maxsize*/bouncebufsize, /*nsegments*/1, /*maxsegz*/0x3ffff, /*flags*/BUS_DMA_ISA, + /*lockfunc*/busdma_lock_mutex, + /*lockarg*/&Giant, &dma_tag[chan]) != 0) { panic("isa_dmainit: unable to create dma tag\n"); } ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/amd64/amd64/busdma_machdep.c,v 1.46 2003/06/28 06:07:06 scottl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.49 2003/07/01 19:16:48 mux Exp $"); + #include #include #include @@ -62,6 +63,8 @@ int flags; int ref_count; int map_count; + bus_dma_lock_t *lockfunc; + void *lockfuncarg; }; struct bounce_page { @@ -74,6 +77,7 @@ int busdma_swi_pending; +static struct mtx bounce_lock; static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; static int free_bpages; static int reserved_bpages; @@ -90,7 +94,6 @@ bus_size_t buflen; /* unmapped buffer length */ bus_dmamap_callback_t *callback; void *callback_arg; - struct mtx *callback_mtx; STAILQ_ENTRY(bus_dmamap) links; }; @@ -101,20 +104,17 @@ static void init_bounce_pages(void *dummy); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, - int commit); + int commit); static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr, bus_size_t size); static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage); static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr); -/* To protect all the the bounce pages related lists and data. */ -static struct mtx bounce_lock; - /* * Return true if a match is made. - * + * * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. - * + * * If paddr is within the bounds of the dma tag then call the filter callback * to check for a match, if there is no filter callback then assume a match. */ @@ -136,6 +136,46 @@ return (retval); } +/* + * Convenience function for manipulating driver locks from busdma (during + * busdma_swi, for example). Drivers that don't provide their own locks + * should specify &Giant to dmat->lockfuncarg. Drivers that use their own + * non-mutex locking scheme don't have to use this at all. + */ +void +busdma_lock_mutex(void *arg, bus_dma_lock_op_t op) +{ + struct mtx *dmtx; + + dmtx = (struct mtx *)arg; + switch (op) { + case BUS_DMA_LOCK: + mtx_lock(dmtx); + break; + case BUS_DMA_UNLOCK: + mtx_unlock(dmtx); + break; + default: + panic("Unknown operation 0x%x for busdma_lock_mutex!", op); + } +} + +/* + * dflt_lock should never get called. It gets put into the dma tag when + * lockfunc == NULL, which is only valid if the maps that are associated + * with the tag are meant to never be defered. + * XXX Should have a way to identify which driver is responsible here. + */ +static void +dflt_lock(void *arg, bus_dma_lock_op_t op) +{ +#ifdef INVARIANTS + panic("driver error: busdma dflt_lock called"); +#else + printf("DRIVER_ERROR: busdma dflt_lock called\n"); +#endif +} + #define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 /* * Allocate a device specific dma_tag. @@ -145,7 +185,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat) + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat) { bus_dma_tag_t newtag; int error = 0; @@ -171,6 +212,13 @@ newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; + if (lockfunc != NULL) { + newtag->lockfunc = lockfunc; + newtag->lockfuncarg = lockfuncarg; + } else { + newtag->lockfunc = dflt_lock; + newtag->lockfuncarg = NULL; + } /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { @@ -323,7 +371,7 @@ int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) { - if (map != NULL) { + if (map != NULL && map != &nobounce_dmamap) { if (STAILQ_FIRST(&map->bpages) != NULL) return (EBUSY); free(map, M_DEVBUF); @@ -460,7 +508,7 @@ map->buf = buf; map->buflen = buflen; STAILQ_INSERT_TAIL(&bounce_map_waitinglist, - map, links); + map, links); mtx_unlock(&bounce_lock); return (EINPROGRESS); } @@ -590,8 +638,7 @@ #endif int nsegs, error; - KASSERT(m0->m_flags & M_PKTHDR, - ("bus_dmamap_load_mbuf: no packet header")); + M_ASSERTPKTHDR(m0); flags |= BUS_DMA_NOWAIT; nsegs = 0; @@ -767,7 +814,7 @@ M_NOWAIT, 0ul, dmat->lowaddr, PAGE_SIZE, - 0); + dmat->boundary); mtx_unlock(&Giant); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); @@ -862,18 +909,18 @@ void busdma_swi(void) { + bus_dma_tag_t dmat; struct bus_dmamap *map; mtx_lock(&bounce_lock); while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); - if (map->callback_mtx != NULL) - mtx_lock(map->callback_mtx); + dmat = map->dmat; + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); - if (map->callback_mtx != NULL) - mtx_unlock(map->callback_mtx); + (dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_UNLOCK); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/uart/amd64/include/bus_dma.h#2 (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/amd64/include/bus_dma.h,v 1.22 2003/05/30 20:40:33 hmp Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.23 2003/07/01 15:51:51 scottl Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ @@ -132,6 +132,17 @@ typedef int bus_dma_filter_t(void *, bus_addr_t); /* + * A function that performs driver-specific syncronization on behalf of + * busdma. + */ +typedef enum { + BUS_DMA_LOCK = 0x01, + BUS_DMA_UNLOCK = 0x02, +} bus_dma_lock_op_t; + +typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t); + +/* * Allocate a device specific dma_tag encapsulating the constraints of * the parent tag in addition to other restrictions specified: * @@ -156,7 +167,8 @@ bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr, bus_dma_filter_t *filtfunc, void *filtfuncarg, bus_size_t maxsize, int nsegments, - bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat); + bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, + void *lockfuncarg, bus_dma_tag_t *dmat); int bus_dma_tag_destroy(bus_dma_tag_t dmat); @@ -238,4 +250,8 @@ if ((dmamap) != NULL) \ _bus_dmamap_unload(dmat, dmamap) +/* + * Generic helper function for manipulating mutexes. + */ +void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op); #endif /* _AMD64_BUS_DMA_H_ */ ==== //depot/projects/uart/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.34 2003/06/26 03:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -43,7 +43,6 @@ .if defined(REALLY_AMD64) CFLAGS+= -m32 -I. -LDFLAGS= -m elf_i386_fbsd .endif CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}/../common ==== //depot/projects/uart/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.71 2003/05/16 04:31:00 murray Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $ ############################################################## ### Basic configuration options ############################ @@ -46,6 +46,7 @@ ############################################################## #autoboot_delay="10" # Delay in seconds before autobooting +#beastie_disable="NO" # Turn the beastie boot menu on and off #console="vidconsole" # Set the current console #currdev="disk1s1a" # Set the current device module_path="/boot/kernel;/boot/modules" # Set the module search path ==== //depot/projects/uart/boot/i386/btx/lib/Makefile#2 (text+ko) ==== @@ -1,14 +1,11 @@ -# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.10 2002/09/17 01:48:55 peter Exp $ +# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.11 2003/06/30 14:10:57 ru Exp $ OBJS= btxcsu.o btxsys.o btxv86.o -CLEANFILES+= crt0.o ${OBJS} +CLEANFILES= crt0.o all: crt0.o crt0.o: ${OBJS} ${LD} ${LDFLAGS} -i -o ${.TARGET} ${OBJS} -.include - -.s.o: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.include ==== //depot/projects/uart/boot/pc98/btx/lib/Makefile#2 (text+ko) ==== @@ -1,14 +1,11 @@ -# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.7 2002/09/19 13:43:02 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.8 2003/06/30 14:10:58 ru Exp $ OBJS= btxcsu.o btxsys.o btxv86.o -CLEANFILES+= crt0.o ${OBJS} +CLEANFILES= crt0.o all: crt0.o crt0.o: ${OBJS} ${LD} ${LDFLAGS} -i -o ${.TARGET} ${OBJS} -.include - -.s.o: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.include ==== //depot/projects/uart/conf/files.sparc64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.43 2003/06/19 18:06:58 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.44 2003/07/01 14:52:46 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -35,6 +35,10 @@ sparc64/isa/ofw_isa.c optional isa sparc64/pci/apb.c optional apb sparc64/pci/ofw_pci.c optional pci +sparc64/pci/ofw_pcib.c optional pci ofw_newpci +sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci +sparc64/pci/ofw_pcibus.c optional pci ofw_newpci +sparc64/pci/ofw_pci_if.m optional pci sparc64/pci/psycho.c optional pci sparc64/sbus/sbus.c optional sbus sparc64/sparc64/autoconf.c standard @@ -72,7 +76,6 @@ sparc64/sparc64/pmap.c standard sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard -sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/spitfire.c standard sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard ==== //depot/projects/uart/conf/options.sparc64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.6 2003/06/12 15:00:34 tmm Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.7 2003/07/01 14:52:46 tmm Exp $ SUN4U opt_global.h @@ -6,6 +6,7 @@ PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h +OFW_NEWPCI opt_ofw_pci.h # Normal IOMMU debugging IOMMU_DEBUG opt_iommu.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. ==== //depot/projects/uart/dev/aac/aac.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.69 2003/06/03 02:10:55 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.70 2003/07/01 15:51:51 scottl Exp $ */ /* @@ -233,8 +233,15 @@ if ((error = aac_check_firmware(sc)) != 0) return(error); - /* Init the sync fib lock */ + /* + * Initialize locks + */ AAC_LOCK_INIT(&sc->aac_sync_lock, "AAC sync FIB lock"); + AAC_LOCK_INIT(&sc->aac_aifq_lock, "AAC AIF lock"); + AAC_LOCK_INIT(&sc->aac_io_lock, "AAC I/O lock"); + AAC_LOCK_INIT(&sc->aac_container_lock, "AAC container lock"); + TAILQ_INIT(&sc->aac_container_tqh); + /* * Initialise the adapter. @@ -248,14 +255,6 @@ aac_describe_controller(sc); /* - * Initialize locks - */ - AAC_LOCK_INIT(&sc->aac_aifq_lock, "AAC AIF lock"); - TAILQ_INIT(&sc->aac_container_tqh); - AAC_LOCK_INIT(&sc->aac_container_lock, "AAC container lock"); - AAC_LOCK_INIT(&sc->aac_io_lock, "AAC I/O lock"); - - /* * Register to probe our containers later. */ sc->aac_ich.ich_func = aac_startup; @@ -1450,6 +1449,8 @@ AAC_MAXSGENTRIES, /* nsegments */ MAXBSIZE, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &sc->aac_io_lock, /* lockfuncarg */ &sc->aac_buffer_dmat)) { device_printf(sc->aac_dev, "can't allocate buffer DMA tag\n"); goto out; @@ -1471,6 +1472,7 @@ AAC_FIB_COUNT * sizeof(struct aac_fib), /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ + NULL, NULL, /* No locking needed */ &sc->aac_fib_dmat)) { device_printf(sc->aac_dev, "can't allocate FIB DMA tag\n");; goto out; @@ -1490,6 +1492,7 @@ 1, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 2 03:44:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DCBB37B404; Wed, 2 Jul 2003 03:44:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B29137B401 for ; Wed, 2 Jul 2003 03:44:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B486B43FE1 for ; Wed, 2 Jul 2003 03:44:27 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h62AiR0U019039 for ; Wed, 2 Jul 2003 03:44:27 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h62AiRvg019036 for perforce@freebsd.org; Wed, 2 Jul 2003 03:44:27 -0700 (PDT) Date: Wed, 2 Jul 2003 03:44:27 -0700 (PDT) Message-Id: <200307021044.h62AiRvg019036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 10:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=33972 Change 33972 by cvance@cvance_korben on 2003/07/02 03:43:53 This version of FreeBSD requires the -r flag for disklabel Affected files ... .. //depot/projects/trustedbsd/sebsd/release/scripts/doFS.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/release/scripts/doFS.sh#2 (text+ko) ==== @@ -27,7 +27,7 @@ # disklabel fails otherwise. # if [ -f "${RD}/trees/base/boot/boot1" ]; then - BOOT1="-B -b ${RD}/trees/base/boot/boot1" + BOOT1="-r -B -b ${RD}/trees/base/boot/boot1" else BOOT1="-r" fi From owner-p4-projects@FreeBSD.ORG Wed Jul 2 03:45:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B9637B404; Wed, 2 Jul 2003 03:45:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1188437B401 for ; Wed, 2 Jul 2003 03:45:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB5004400F for ; Wed, 2 Jul 2003 03:45:29 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h62AjT0U019121 for ; Wed, 2 Jul 2003 03:45:29 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h62AjTup019115 for perforce@freebsd.org; Wed, 2 Jul 2003 03:45:29 -0700 (PDT) Date: Wed, 2 Jul 2003 03:45:29 -0700 (PDT) Message-Id: <200307021045.h62AjTup019115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 10:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=33973 Change 33973 by cvance@cvance_korben on 2003/07/02 03:45:07 Reduce the chunking size so this version of sysinstall won't die. Build modules for optional kernels Affected files ... .. //depot/projects/trustedbsd/sebsd/release/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/release/Makefile#2 (text+ko) ==== @@ -58,8 +58,8 @@ # If you want to pass flags to the world build such as -j X, use # WORLD_FLAGS. Similarly, you can specify make flags for kernel # builds via KERNEL_FLAGS. -#WORLD_FLAGS=-j4 -#KERNEL_FLAGS=-j4 +WORLD_FLAGS=-j3 +KERNEL_FLAGS=-j3 TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} @@ -218,7 +218,7 @@ MFSSIZE= 8192 .endif -ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - +ZIPNSPLIT= gzip --no-name -9 -c | split -b 240640 - # Things that need to be recompiled with Kerberos support. .if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS) @@ -511,7 +511,7 @@ release.4: .for kernel in ${KERNELS} cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ + ${CROSSMAKE} ${KERNEL_FLAGS} \ KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \ DESTDIR=${RD}/trees/base .endfor From owner-p4-projects@FreeBSD.ORG Wed Jul 2 04:16:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D155E37B404; Wed, 2 Jul 2003 04:16:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E42337B401 for ; Wed, 2 Jul 2003 04:16:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04DF043F75 for ; Wed, 2 Jul 2003 04:16:08 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h62BG70U028885 for ; Wed, 2 Jul 2003 04:16:07 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h62BG7jM028882 for perforce@freebsd.org; Wed, 2 Jul 2003 04:16:07 -0700 (PDT) Date: Wed, 2 Jul 2003 04:16:07 -0700 (PDT) Message-Id: <200307021116.h62BG7jM028882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 11:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=33975 Change 33975 by cvance@cvance_korben on 2003/07/02 04:15:42 Add installation instructions Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/SEBSD-INSTALL#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 2 04:20:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D7B37B40B; Wed, 2 Jul 2003 04:20:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8D1B37B401 for ; Wed, 2 Jul 2003 04:20:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD75F44028 for ; Wed, 2 Jul 2003 04:20:13 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h62BKD0U029021 for ; Wed, 2 Jul 2003 04:20:13 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h62BKDrO028998 for perforce@freebsd.org; Wed, 2 Jul 2003 04:20:13 -0700 (PDT) Date: Wed, 2 Jul 2003 04:20:13 -0700 (PDT) Message-Id: <200307021120.h62BKDrO028998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 33976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 11:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=33976 Change 33976 by cvance@cvance_demo on 2003/07/02 04:19:21 Tweak the sysinstall program just a bit, default to the UFS2 filesystem, and remove options to install "All", since they are unsupported with this release. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/label.c#2 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/menus.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/label.c#2 (text+ko) ==== @@ -337,7 +337,11 @@ pi->newfs_data.newfs_ufs.acls = FALSE; pi->newfs_data.newfs_ufs.multilabel = FALSE; pi->newfs_data.newfs_ufs.softupdates = strcmp(mpoint, "/"); - pi->newfs_data.newfs_ufs.ufs2 = FALSE; + /* + * SEBSD/MAC Need to default to ufs2, for label support + * and because ufs1 is broken with this installer version + */ + pi->newfs_data.newfs_ufs.ufs2 = TRUE; return pi; } ==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/menus.c#2 (text+ko) ==== @@ -919,8 +919,6 @@ "distributions", { { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All system sources, binaries and X Window System)", - checkDistEverything, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Reset", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, { "4 Developer", "Full sources, binaries and doc but no games", @@ -951,8 +949,6 @@ NULL, { { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All system sources, binaries and X Window System", - NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Reset", "Reset all of the below", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, { " base", "Binary base distribution (required)", From owner-p4-projects@FreeBSD.ORG Wed Jul 2 11:20:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E5F737B404; Wed, 2 Jul 2003 11:20:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FE5C37B401 for ; Wed, 2 Jul 2003 11:20:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D08AD43FBD for ; Wed, 2 Jul 2003 11:20:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h62IKt0U072257 for ; Wed, 2 Jul 2003 11:20:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h62IKt5S072248 for perforce@freebsd.org; Wed, 2 Jul 2003 11:20:55 -0700 (PDT) Date: Wed, 2 Jul 2003 11:20:55 -0700 (PDT) Message-Id: <200307021820.h62IKt5S072248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 33995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 18:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=33995 Change 33995 by peter@peter_daintree on 2003/07/02 11:20:03 IFC @33994 Affected files ... .. //depot/projects/hammer/Makefile.inc1#21 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#4 integrate .. //depot/projects/hammer/lib/libc_r/arch/alpha/_atomic_lock.S#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/hammer/sbin/Makefile#13 integrate .. //depot/projects/hammer/sbin/mount_nwfs/Makefile#2 delete .. //depot/projects/hammer/sbin/mount_nwfs/mount_nwfs.8#3 delete .. //depot/projects/hammer/sbin/mount_nwfs/mount_nwfs.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/Makefile#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/activate.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/conf.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/mount_portalfs.8#3 delete .. //depot/projects/hammer/sbin/mount_portalfs/mount_portalfs.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pathnames.h#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/portal.conf#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/portald.h#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pt_conf.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pt_exec.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pt_file.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pt_tcp.c#2 delete .. //depot/projects/hammer/sbin/mount_portalfs/pt_tcplisten.c#2 delete .. //depot/projects/hammer/sbin/mount_smbfs/Makefile#3 delete .. //depot/projects/hammer/share/mk/bsd.dep.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/hammer/share/mk/sys.mk#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/hammer/sys/boot/ia64/libski/pal_stub.s#2 delete .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/hammer/sys/conf/files.ia64#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbd.c#5 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#1 branch .. //depot/projects/hammer/sys/dev/ppc/ppcreg.h#1 branch .. //depot/projects/hammer/sys/dev/random/randomdev.c#5 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#13 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/context.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/context.s#3 delete .. //depot/projects/hammer/sys/ia64/ia64/exception.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/exception.s#13 delete .. //depot/projects/hammer/sys/ia64/ia64/locore.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/locore.s#9 delete .. //depot/projects/hammer/sys/ia64/ia64/pal.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/pal.s#3 delete .. //depot/projects/hammer/sys/ia64/ia64/setjmp.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/setjmp.s#2 delete .. //depot/projects/hammer/sys/ia64/ia64/support.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/support.s#5 delete .. //depot/projects/hammer/sys/ia64/ia64/syscall.S#1 branch .. //depot/projects/hammer/sys/ia64/ia64/syscall.s#4 delete .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#4 integrate .. //depot/projects/hammer/sys/isa/fd.c#9 integrate .. //depot/projects/hammer/sys/isa/isahint.c#3 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_hints.c#3 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#9 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#9 integrate .. //depot/projects/hammer/sys/pc98/pc98/syscons_pc98.c#6 integrate .. //depot/projects/hammer/sys/sys/bus.h#6 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#7 integrate .. //depot/projects/hammer/usr.sbin/Makefile#23 integrate .. //depot/projects/hammer/usr.sbin/mount_nwfs/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/mount_nwfs/mount_nwfs.8#1 branch .. //depot/projects/hammer/usr.sbin/mount_nwfs/mount_nwfs.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/activate.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/conf.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.8#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pathnames.h#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/portal.conf#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/portald.h#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_conf.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_exec.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_file.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_tcp.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_tcplisten.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#1 branch Differences ... ==== //depot/projects/hammer/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.372 2003/07/01 12:57:53 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.373 2003/07/01 23:10:39 gordon Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -66,7 +66,7 @@ .if exists(${.CURDIR}/libexec) SUBDIR+= libexec .endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) +.if exists(${.CURDIR}/rescue) && defined(RESCUE) SUBDIR+= rescue .endif .if exists(${.CURDIR}/sbin) ==== //depot/projects/hammer/contrib/groff/tmac/tty-char.tmac#4 (text+ko) ==== @@ -135,6 +135,12 @@ .tty-char \[rf] _| .tty-char \[lc] |~ .tty-char \[rc] ~| +.tty-char \[lb] `- +.tty-char \[rb] -' +.tty-char \[lk] { +.tty-char \[rk] } +.tty-char \[lt] ,- +.tty-char \[rt] -. .\" Latin-1 characters .tty-char \[r!] \z,i .tty-char \[Po] \z-L ==== //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.21 2002/09/17 11:28:24 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $"); #include #include @@ -50,7 +50,7 @@ { size_t on; int ret; - char dummy; + char dummy[2]; FILE f; struct __sFILEX ext; @@ -61,8 +61,10 @@ n = INT_MAX; /* Stdio internals do not deal correctly with zero length buffer */ if (n == 0) { - str = &dummy; - n = 1; + if (on > 0) + *str = '\0'; + str = dummy; + n = 1; } f._file = -1; f._flags = __SWR | __SSTR; ==== //depot/projects/hammer/lib/libc_r/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/Makefile,v 1.33 2003/07/01 15:07:01 ru Exp $ +# $FreeBSD: src/lib/libc_r/Makefile,v 1.35 2003/07/02 13:27:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does ==== //depot/projects/hammer/lib/libc_r/arch/alpha/_atomic_lock.S#2 (text+ko) ==== @@ -19,11 +19,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.3 1999/08/28 00:03:00 peter Exp $ + * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.4 2003/07/02 13:27:54 ru Exp $ * */ -#include "SYS.h" +#include /* * Atomicly lock a location with an identifier provided the location ==== //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.22 2003/06/28 09:39:35 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.23 2003/07/02 13:23:03 davidxu Exp $ */ #include #include @@ -75,7 +75,7 @@ pthread->cancelflags |= THR_CANCELLING; _thr_setrunnable_unlocked(pthread); if ((joinee != NULL) && - (curthread->kseg == joinee->kseg)) { + (pthread->kseg == joinee->kseg)) { /* Remove the joiner from the joinee. */ joinee->joiner = NULL; joinee = NULL; ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.45 2003/06/28 09:40:57 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.46 2003/07/02 14:12:37 davidxu Exp $ */ #include #include @@ -539,8 +539,10 @@ /* The wait timedout. */ rval = ETIMEDOUT; (void)_mutex_cv_lock(mutex); - } else if (interrupted || done) + } else if (interrupted || done) { rval = _mutex_cv_lock(mutex); + unlock_mutex = 1; + } } } break; @@ -738,7 +740,7 @@ while ((pthread = TAILQ_FIRST(&cond->c_queue)) != NULL) { TAILQ_REMOVE(&cond->c_queue, pthread, sqe); - THR_CONDQ_SET(pthread); + THR_CONDQ_CLEAR(pthread); if ((pthread->timeout == 0) && (pthread->interrupted == 0)) /* * Only exit the loop when we find a thread ==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.14 2003/07/01 15:52:09 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.15 2003/07/02 02:05:23 mtm Exp $ */ #include #include @@ -85,11 +85,11 @@ /* Single underscore versions provided for libc internal usage: */ __weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); +__weak_reference(__pthread_mutex_unlock, pthread_mutex_unlock); /* No difference between libc and application usage of these: */ __weak_reference(_pthread_mutex_init, pthread_mutex_init); __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); -__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); /* @@ -505,6 +505,9 @@ return (ret); } +/* + * Libc internal. + */ int _pthread_mutex_lock(pthread_mutex_t *mutex) { @@ -513,6 +516,8 @@ if (_thread_initial == NULL) _thread_init(); + _thread_sigblock(); + if (mutex == NULL) ret = EINVAL; @@ -524,13 +529,28 @@ ((ret = mutex_init(mutex, 1)) == 0)) ret = mutex_lock_common(mutex, 0); + if (ret != 0) + _thread_sigunblock(); + return (ret); } int +__pthread_mutex_unlock(pthread_mutex_t * mutex) +{ + return (mutex_unlock_common(mutex, /* add reference */ 0)); +} + +/* + * Libc internal + */ +int _pthread_mutex_unlock(pthread_mutex_t * mutex) { - return (mutex_unlock_common(mutex, /* add reference */ 0)); + int error; + if ((error = mutex_unlock_common(mutex, /* add reference */ 0)) == 0) + _thread_sigunblock(); + return (error); } int ==== //depot/projects/hammer/sbin/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.122 2003/06/17 09:12:42 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.123 2003/07/02 16:16:49 gordon Exp $ # XXX MISSING: icheck ncheck @@ -47,7 +47,6 @@ mount_nfs \ mount_ntfs \ mount_nullfs \ - mount_portalfs \ mount_std \ mount_udf \ mount_umapfs \ @@ -93,9 +92,7 @@ .endif .if ${MACHINE_ARCH} == "i386" -SUBDIR+=cxconfig \ - mount_nwfs \ - mount_smbfs +SUBDIR+=cxconfig .if ${MACHINE} == "pc98" SUBDIR+=fdisk_pc98 .else ==== //depot/projects/hammer/share/mk/bsd.dep.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.39 2003/07/01 15:15:45 ru Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.40 2003/07/02 16:43:07 ru Exp $ # # The include file handles Makefile dependencies. # @@ -114,10 +114,10 @@ # Split up the sources, and filter out headers and non-applicable flags. ${DEPENDFILE}: ${SRCS} rm -f ${DEPENDFILE} -.if ${SRCS:M*.[cSs]} != "" +.if ${SRCS:M*.[cS]} != "" ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \ - ${.ALLSRC:M*.[cSs]} + ${.ALLSRC:M*.[cS]} .endif .if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cpp} != "" || \ ${SRCS:M*.cxx} != "" ==== //depot/projects/hammer/share/mk/bsd.lib.mk#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.146 2003/07/01 15:15:45 ru Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.148 2003/07/02 17:03:28 ru Exp $ # .include @@ -36,7 +36,7 @@ # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .So used for PIC object files .SUFFIXES: -.SUFFIXES: .out .o .po .So .S .s .asm .c .cc .cpp .cxx .m .C .f .y .l .ln +.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .m .C .f .y .l .ln .if !defined(PICFLAG) .if ${MACHINE_ARCH} == "sparc64" @@ -70,13 +70,13 @@ .m.So: ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.s.o .asm.o: - ${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.s.po .s.So: + ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} -.s.po .asm.po: +.asm.po: ${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.s.So .asm.So: +.asm.So: ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ==== //depot/projects/hammer/share/mk/sys.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.69 2003/07/01 15:15:45 ru Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.70 2003/07/02 17:03:28 ru Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -16,7 +16,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .s .asm .cl .p .h .sh +.SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh .endif .LIBS: .a @@ -208,7 +208,10 @@ .S.o: ${CC} ${CFLAGS} -c ${.IMPSRC} -.s.o .asm.o: +.asm.o: + ${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} + +.s.o: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} # XXX not -j safe ==== //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.42 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.43 2003/07/02 16:09:00 jhb Exp $"); #include #include @@ -349,7 +349,6 @@ mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - int dv; struct pcs *pcsp; if (i == boot_cpu_id) @@ -380,8 +379,7 @@ } continue; } - dv = 0; - if (resource_int_value("cpu", i, "disable", &dv) == 0 && dv) { + if (resource_disabled("cpu", i)) printf("CPU %d disabled by loader.\n", i); continue; } ==== //depot/projects/hammer/sys/boot/efi/libefi/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.11 2002/12/10 06:22:25 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.12 2003/07/02 11:53:55 ru Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} @@ -6,7 +6,7 @@ INTERNALLIB= true SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c -SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.s +SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S .if ${MACHINE_ARCH} == "ia64" SRCS+= efifpswa.c ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.31 2003/06/07 17:42:26 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.32 2003/07/02 12:45:45 ru Exp $ # LIB= i386 INTERNALLIB= true @@ -7,7 +7,7 @@ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ - i386_copy.c i386_module.c nullconsole.c pxe.c \ + i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c amd64_tramp.S CFLAGS+= -ffreestanding @@ -45,8 +45,4 @@ .endif -OBJS+= pxetramp.o -pxetramp.o: pxetramp.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*} - .include ==== //depot/projects/hammer/sys/boot/ia64/libski/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.9 2003/02/01 22:50:08 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.10 2003/07/02 11:47:33 ru Exp $ LIB= ski INTERNALLIB= true SRCS= skiconsole.c time.c copy.c devicename.c module.c exit.c SRCS+= delay.c skifs.c elf_freebsd.c bootinfo.c ssc.c -SRCS+= acpi_stub.c efi_stub.c pal_stub.s sal_stub.c +SRCS+= acpi_stub.c efi_stub.c pal_stub.S sal_stub.c CFLAGS+= -ffreestanding -fpic -g CFLAGS+= -I${.CURDIR}/../include ==== //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.17 2003/06/08 03:16:59 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.18 2003/07/02 12:45:45 ru Exp $ # LIB= pc98 INTERNALLIB= true @@ -7,7 +7,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ - gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c \ + gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c CFLAGS+= -ffreestanding @@ -46,8 +46,4 @@ .endif -OBJS+= pxetramp.o -pxetramp.o: pxetramp.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*} - .include ==== //depot/projects/hammer/sys/conf/files.ia64#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.52 2003/05/16 21:26:40 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.53 2003/07/02 12:57:06 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,7 +75,7 @@ ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard ia64/ia64/clock_if.m standard -ia64/ia64/context.s standard +ia64/ia64/context.S standard ia64/ia64/critical.c standard ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb @@ -84,26 +84,26 @@ ia64/ia64/efi.c standard ia64/ia64/eficlock.c standard ia64/ia64/elf_machdep.c standard -ia64/ia64/exception.s standard +ia64/ia64/exception.S standard ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/in_cksum.c optional inet ia64/ia64/interrupt.c standard -ia64/ia64/locore.s standard no-obj +ia64/ia64/locore.S standard no-obj ia64/ia64/machdep.c standard ia64/ia64/mca.c standard ia64/ia64/mem.c standard ia64/ia64/mp_machdep.c optional smp ia64/ia64/nexus.c standard -ia64/ia64/pal.s standard +ia64/ia64/pal.S standard ia64/ia64/pmap.c standard ia64/ia64/sal.c standard ia64/ia64/sapic.c standard -ia64/ia64/setjmp.s standard +ia64/ia64/setjmp.S standard ia64/ia64/ssc.c optional ski ia64/ia64/sscdisk.c optional ski -ia64/ia64/support.s standard +ia64/ia64/support.S standard ia64/ia64/sys_machdep.c standard -ia64/ia64/syscall.s standard +ia64/ia64/syscall.S standard ia64/ia64/trap.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.89 2003/05/01 18:51:43 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.90 2003/07/02 16:09:00 jhb Exp $ */ #include "opt_acpi.h" @@ -215,8 +215,7 @@ /* * Check that we haven't been disabled with a hint. */ - if (!resource_int_value("acpi", 0, "disabled", &error) && - (error != 0)) + if (resource_disabled("acpi", 0)) return_VOID; /* @@ -2175,13 +2174,11 @@ static void acpi_pm_register(void *arg) { - int error; if (!cold) return; - if (!resource_int_value("acpi", 0, "disabled", &error) && - (error != 0)) + if (resource_disabled("acpi", 0)) return; power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL); ==== //depot/projects/hammer/sys/dev/ata/ata-chipset.c#14 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-chipset.c,v 1.31 2003/06/27 10:11:54 grehan Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.32 2003/07/02 10:50:44 sos Exp $ */ #include "opt_ata.h" #include @@ -93,6 +93,8 @@ static int ata_serverworks_chipinit(device_t); static void ata_serverworks_setmode(struct ata_device *, int); static int ata_sii_chipinit(device_t); +static int ata_sii_mio_allocate(device_t, struct ata_channel *); +static void ata_sii_intr(void *); static void ata_cmd_intr(void *); static void ata_sii_setmode(struct ata_device *, int); static void ata_cmd_setmode(struct ata_device *, int); @@ -838,11 +840,6 @@ mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); - if (mode >= ATA_SA150) { - atadev->mode = mode; - return; - } - if (ctlr->chip->max_dma && mode > ATA_UDMA2 && !(reg54 & (0x10 << devno))) { ata_prtdev(atadev,"DMA limited to UDMA33, non-ATA66 cable or device\n"); mode = ATA_UDMA2; @@ -854,7 +851,10 @@ ata_prtdev(atadev, "%s setting %s on %s chip\n", (error) ? "failed" : "success", ata_mode2str(mode), ctlr->chip->text); - if (!error) { + if (error) + return; + + if (ctlr->chip->max_dma < ATA_SA150) { if (mode >= ATA_UDMA0) { pci_write_config(parent, 0x48, reg48 | (0x0001 << devno), 2); pci_write_config(parent, 0x4a, (reg4a & ~(0x3 << (devno<<2))) | @@ -894,8 +894,8 @@ } pci_write_config(parent, 0x40, (reg40 & ~mask40) | new40, 4); pci_write_config(parent, 0x44, (reg44 & ~mask44) | new44, 1); - atadev->mode = mode; } + atadev->mode = mode; } /* @@ -1244,11 +1244,6 @@ break; } - if (mode >= ATA_SA150) { - atadev->mode = mode; - return; - } - error = ata_command(atadev, ATA_C_SETFEATURES, 0, mode, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) @@ -1458,11 +1453,12 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_SII0680, 0x00, 0, SII_SETCLK, ATA_UDMA6, "SiI 0680" }, - { ATA_CMD649, 0x00, 0, SII_INTR|SII_ENINTR, ATA_UDMA5, "CMD 649" }, - { ATA_CMD648, 0x00, 0, SII_INTR|SII_ENINTR, ATA_UDMA4, "CMD 648" }, - { ATA_CMD646, 0x07, 0, SII_ENINTR, ATA_UDMA2, "CMD 646U2" }, - { ATA_CMD646, 0x00, 0, SII_ENINTR, ATA_WDMA2, "CMD 646" }, + {{ ATA_SII3112, 0x00, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, + { ATA_SII0680, 0x00, SIIMEMIO, SIISETCLK, ATA_UDMA6, "SiI 0680" }, + { ATA_CMD649, 0x00, 0, SIIINTR, ATA_UDMA5, "CMD 649" }, + { ATA_CMD648, 0x00, 0, SIIINTR, ATA_UDMA4, "CMD 648" }, + { ATA_CMD646, 0x07, 0, 0, ATA_UDMA2, "CMD 646U2" }, + { ATA_CMD646, 0x00, 0, 0, ATA_WDMA2, "CMD 646" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -1487,38 +1483,105 @@ device_printf(dev, "unable to map interrupt\n"); return ENXIO; } - if ((bus_setup_intr(dev, ctlr->r_irq, INTR_TYPE_BIO | INTR_ENTROPY, - ctlr->chip->cfg2 & SII_INTR ? - ata_cmd_intr : ata_generic_intr, - ctlr, &ctlr->handle))) { - device_printf(dev, "unable to setup interrupt\n"); - return ENXIO; + + if (ctlr->chip->cfg1 == SIIMEMIO) { + if ((bus_setup_intr(dev, ctlr->r_irq, INTR_TYPE_BIO | INTR_ENTROPY, + ata_sii_intr, ctlr, &ctlr->handle))) { + device_printf(dev, "unable to setup interrupt\n"); + return ENXIO; + } + rid = 0x24; + if (!(ctlr->r_io2 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, + 0, ~0, 1, RF_ACTIVE))) + return ENXIO; + + if (ctlr->chip->cfg2 & SIISETCLK) { + if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10) + pci_write_config(dev, 0x8a, + (pci_read_config(dev, 0x8a, 1) & 0x0F)|0x10,1); + if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10) + device_printf(dev, "%s could not set ATA133 clock\n", + ctlr->chip->text); + } + ctlr->allocate = ata_sii_mio_allocate; + ctlr->setmode = ata_sii_setmode; } + else { + if ((bus_setup_intr(dev, ctlr->r_irq, INTR_TYPE_BIO | INTR_ENTROPY, + ctlr->chip->cfg2 & SIIINTR ? + ata_cmd_intr : ata_generic_intr, + ctlr, &ctlr->handle))) { + device_printf(dev, "unable to setup interrupt\n"); + return ENXIO; + } + + if ((pci_read_config(dev, 0x51, 1) & 0x08) != 0x08) { + device_printf(dev, "HW has secondary channel disabled\n"); + ctlr->channels = 1; + } - if (ctlr->chip->cfg2 & SII_ENINTR) + /* enable interrupt as BIOS might not */ pci_write_config(dev, 0x71, 0x01, 1); - if (ctlr->chip->cfg2 & SII_SETCLK) { - if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10) - pci_write_config(dev, 0x8a, - (pci_read_config(dev, 0x8a, 1) & 0x0F) | 0x10, 1); - if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10) - device_printf(dev, "%s could not set ATA133 clock\n", - ctlr->chip->text); - ctlr->setmode = ata_sii_setmode; + ctlr->setmode = ata_cmd_setmode; } - else - ctlr->setmode = ata_cmd_setmode; + return 0; +} + +static int +ata_sii_mio_allocate(device_t dev, struct ata_channel *ch) +{ + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + int i; - if ((pci_read_config(dev, 0x51, 1) & 0x08) != 0x08) { - device_printf(dev, "secondary channel disabled\n"); - ctlr->channels = 1; - } + for (i = ATA_DATA; i <= ATA_STATUS; i++) { + ch->r_io[i].res = ctlr->r_io2; + ch->r_io[i].offset = 0x80 + i + (ch->unit << 6); + } + ch->r_io[ATA_ALTSTAT].res = ctlr->r_io2; + ch->r_io[ATA_ALTSTAT].offset = 0x8a + (ch->unit << 6); + ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_io2; + ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (ch->unit << 3); + ch->r_io[ATA_BMSTAT_PORT].res = ctlr->r_io2; + ch->r_io[ATA_BMSTAT_PORT].offset = 0x02 + (ch->unit << 3); + ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2; + ch->r_io[ATA_BMDTP_PORT].offset = 0x04 + (ch->unit << 3); + ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2; + ch->r_io[ATA_BMDEVSPEC_0].offset = 0xa1 + (ch->unit << 6); + ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; + if (ctlr->chip->max_dma >= ATA_SA150) + ch->flags |= ATA_NO_SLAVE; + ctlr->dmainit(ch); return 0; } static void +ata_sii_intr(void *data) +{ + struct ata_pci_controller *ctlr = data; + struct ata_channel *ch; + u_int8_t dmastat; + int unit; + + /* implement this as a toggle instead to balance load XXX */ + for (unit = 0; unit < 2; unit++) { + if (!(ch = ctlr->interrupt[unit].argument)) + continue; + if (ATA_IDX_INB(ch, ATA_BMDEVSPEC_0) & 0x08) { + if (ch->dma->flags & ATA_DMA_ACTIVE) { + if (!((dmastat = (ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & + ATA_BMSTAT_MASK)) & ATA_BMSTAT_INTERRUPT)) + continue; + ATA_IDX_OUTB(ch, ATA_BMSTAT_PORT, dmastat|ATA_BMSTAT_INTERRUPT); + DELAY(1); + } + ctlr->interrupt[unit].function(ch); + } + } +} + +static void ata_cmd_intr(void *data) { struct ata_pci_controller *ctlr = data; @@ -1551,7 +1614,7 @@ { device_t parent = device_get_parent(atadev->channel->dev); struct ata_pci_controller *ctlr = device_get_softc(parent); - int devno = (atadev->channel->unit << 4) + (ATA_DEV(atadev->unit) << 1); + int rego = (atadev->channel->unit << 4) + (ATA_DEV(atadev->unit) << 1); int mreg = atadev->channel->unit ? 0x84 : 0x80; int mask = 0x03 << (ATA_DEV(atadev->unit) << 2); int mval = pci_read_config(parent, mreg, 1) & ~mask; @@ -1559,7 +1622,8 @@ mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); - mode = ata_check_80pin(atadev, mode); + if (ctlr->chip->max_dma < ATA_SA150) + mode = ata_check_80pin(atadev, mode); error = ata_command(atadev, ATA_C_SETFEATURES, 0, mode, ATA_C_F_SETXFER, ATA_WAIT_READY); @@ -1567,20 +1631,24 @@ ata_prtdev(atadev, "%s setting %s on %s chip\n", (error) ? "failed" : "success", ata_mode2str(mode), ctlr->chip->text); - if (!error) { + + if (error) + return; + + if (ctlr->chip->max_dma < ATA_SA150) { if (mode >= ATA_UDMA0) { u_int8_t udmatimings[] = { 0xf, 0xb, 0x7, 0x5, 0x3, 0x2, 0x1 }; - u_int8_t ureg = 0xac + devno; + u_int8_t ureg = 0xac + rego; pci_write_config(parent, mreg, mval | (0x03 << (ATA_DEV(atadev->unit) << 2)), 1); pci_write_config(parent, ureg, - (pci_read_config(parent, ureg, 1) & 0x3f) | + (pci_read_config(parent, ureg, 1) & ~0x3f) | udmatimings[mode & ATA_MODE_MASK], 1); } else if (mode >= ATA_WDMA0) { - u_int8_t dreg = 0xa8 + devno; + u_int8_t dreg = 0xa8 + rego; u_int16_t dmatimings[] = { 0x2208, 0x10c2, 0x10c1 }; pci_write_config(parent, mreg, @@ -1589,15 +1657,15 @@ } else { - u_int8_t preg = 0xa4 + devno; + u_int8_t preg = 0xa4 + rego; u_int16_t piotimings[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; pci_write_config(parent, mreg, mval | (0x01 << (ATA_DEV(atadev->unit) << 2)), 1); pci_write_config(parent, preg, piotimings[mode & ATA_MODE_MASK], 2); } - atadev->mode = mode; } + atadev->mode = mode; } static void ==== //depot/projects/hammer/sys/dev/ata/ata-pci.c#11 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-pci.c,v 1.62 2003/06/07 15:19:16 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.63 2003/07/02 10:50:44 sos Exp $ */ #include "opt_ata.h" @@ -152,18 +152,13 @@ cmd = pci_read_config(dev, PCIR_COMMAND, 2); } #endif - /* is busmastering supported and configured ? */ + /* if busmastering configured get the I/O resource */ if ((cmd & PCIM_CMD_BUSMASTEREN) == PCIM_CMD_BUSMASTEREN) { int rid = ATA_BMADDR_RID; - if (!ctlr->r_io2) { - if (!(ctlr->r_io1 = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, 1, RF_ACTIVE))) - device_printf(dev, "Busmastering DMA not configured\n"); - } + ctlr->r_io1 = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, + 0, ~0, 1, RF_ACTIVE); } - else - device_printf(dev, "Busmastering DMA not supported\n"); ctlr->chipinit(dev); ==== //depot/projects/hammer/sys/dev/ata/ata-pci.h#9 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-pci.h,v 1.11 2003/05/18 16:45:48 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.12 2003/07/02 10:50:44 sos Exp $ */ /* structure holding chipset config info */ @@ -154,6 +154,7 @@ #define ATA_SILICON_IMAGE_ID 0x1095 #define ATA_SII0680 0x06801095 +#define ATA_SII3112 0x31121095 #define ATA_CMD646 0x06461095 #define ATA_CMD648 0x06481095 #define ATA_CMD649 0x06491095 @@ -242,9 +243,9 @@ #define SWKS66 1 #define SWKS100 2 -#define SII_INTR 0x01 -#define SII_SETCLK 0x02 -#define SII_ENINTR 0x04 +#define SIIMEMIO 1 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 24 10:35:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7A5737B404; Sat, 24 May 2003 10:35:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6997437B401 for ; Sat, 24 May 2003 10:35:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 128F243F85 for ; Sat, 24 May 2003 10:35:02 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4OHZ10U087139 for ; Sat, 24 May 2003 10:35:01 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4OHZ12o087136 for perforce@freebsd.org; Sat, 24 May 2003 10:35:01 -0700 (PDT) Message-Id: <200305241735.h4OHZ12o087136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 31790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sat, 24 May 2003 17:35:03 -0000 X-Original-Date: Sat, 24 May 2003 10:35:01 -0700 (PDT) X-List-Received-Date: Sat, 24 May 2003 17:35:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=31790 Change 31790 by des@des.at.des.thinksec.com on 2003/05/24 10:34:16 Whitespace cleanup. Affected files ... .. //depot/projects/openpam/misc/gendoc.pl#24 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#24 (text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#23 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#24 $ # use strict; @@ -494,7 +494,7 @@ while () { if (m/^\.Xr (\S+)\s*(\d)\s*$/) { $xref{$1} = $2; - } + } print FILE $_; } @@ -514,14 +514,14 @@ print FILE ".Xr openpam 3\n" if ($page eq 'pam'); foreach $func (keys(%FUNCTIONS)) { - $xref{$func} = 3; + $xref{$func} = 3; } my @refs = sort(keys(%xref)); while ($_ = shift(@refs)) { print FILE ".Xr $_ $xref{$_}"; - print FILE " ," + print FILE " ," if (@refs); - print FILE "\n"; + print FILE "\n"; } print FILE ".Sh STANDARDS .Rs From owner-p4-projects@FreeBSD.ORG Sun Jun 1 05:34:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B48F837B404; Sun, 1 Jun 2003 05:34:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65F9137B401 for ; Sun, 1 Jun 2003 05:34:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F283043FE9 for ; Sun, 1 Jun 2003 05:34:38 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h51CYc0U029138 for ; Sun, 1 Jun 2003 05:34:38 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h51CYc0L029135 for perforce@freebsd.org; Sun, 1 Jun 2003 05:34:38 -0700 (PDT) Message-Id: <200306011234.h51CYc0L029135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 01 Jun 2003 12:34:42 -0000 X-Original-Date: Sun, 1 Jun 2003 05:34:38 -0700 (PDT) X-List-Received-Date: Sun, 01 Jun 2003 12:34:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=32294 Change 32294 by des@des.at.des.thinksec.com on 2003/06/01 05:34:11 Give up trying to keep track of what has changed and what hasn't; just slap a 2003 copyright on everything. Affected files ... .. //depot/projects/openpam/LICENSE#6 edit .. //depot/projects/openpam/Makefile#8 edit .. //depot/projects/openpam/bin/Makefile#7 edit .. //depot/projects/openpam/bin/su/Makefile#8 edit .. //depot/projects/openpam/bin/su/su.c#12 edit .. //depot/projects/openpam/doc/Makefile#5 edit .. //depot/projects/openpam/doc/man/Makefile#13 edit .. //depot/projects/openpam/doc/man/pam_conv.3#3 edit .. //depot/projects/openpam/include/security/openpam.h#24 edit .. //depot/projects/openpam/include/security/pam_appl.h#13 edit .. //depot/projects/openpam/include/security/pam_constants.h#22 edit .. //depot/projects/openpam/include/security/pam_modules.h#9 edit .. //depot/projects/openpam/include/security/pam_types.h#11 edit .. //depot/projects/openpam/lib/Makefile#21 edit .. //depot/projects/openpam/lib/openpam_borrow_cred.c#9 edit .. //depot/projects/openpam/lib/openpam_dispatch.c#21 edit .. //depot/projects/openpam/lib/openpam_dynamic.c#13 edit .. //depot/projects/openpam/lib/openpam_findenv.c#12 edit .. //depot/projects/openpam/lib/openpam_free_data.c#5 edit .. //depot/projects/openpam/lib/openpam_get_option.c#10 edit .. //depot/projects/openpam/lib/openpam_load.c#19 edit .. //depot/projects/openpam/lib/openpam_log.c#23 edit .. //depot/projects/openpam/lib/openpam_nullconv.c#6 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#8 edit .. //depot/projects/openpam/lib/openpam_set_option.c#13 edit .. //depot/projects/openpam/lib/openpam_static.c#6 edit .. //depot/projects/openpam/lib/openpam_ttyconv.c#20 edit .. //depot/projects/openpam/lib/pam_acct_mgmt.c#14 edit .. //depot/projects/openpam/lib/pam_authenticate.c#15 edit .. //depot/projects/openpam/lib/pam_authenticate_secondary.c#8 edit .. //depot/projects/openpam/lib/pam_chauthtok.c#16 edit .. //depot/projects/openpam/lib/pam_close_session.c#13 edit .. //depot/projects/openpam/lib/pam_end.c#13 edit .. //depot/projects/openpam/lib/pam_error.c#10 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#25 edit .. //depot/projects/openpam/lib/pam_get_data.c#12 edit .. //depot/projects/openpam/lib/pam_get_item.c#17 edit .. //depot/projects/openpam/lib/pam_get_mapped_authtok.c#8 edit .. //depot/projects/openpam/lib/pam_get_mapped_username.c#8 edit .. //depot/projects/openpam/lib/pam_get_user.c#17 edit .. //depot/projects/openpam/lib/pam_getenv.c#16 edit .. //depot/projects/openpam/lib/pam_getenvlist.c#12 edit .. //depot/projects/openpam/lib/pam_info.c#9 edit .. //depot/projects/openpam/lib/pam_open_session.c#13 edit .. //depot/projects/openpam/lib/pam_prompt.c#9 edit .. //depot/projects/openpam/lib/pam_putenv.c#12 edit .. //depot/projects/openpam/lib/pam_set_data.c#15 edit .. //depot/projects/openpam/lib/pam_set_item.c#21 edit .. //depot/projects/openpam/lib/pam_set_mapped_authtok.c#8 edit .. //depot/projects/openpam/lib/pam_set_mapped_username.c#8 edit .. //depot/projects/openpam/lib/pam_setcred.c#14 edit .. //depot/projects/openpam/lib/pam_setenv.c#12 edit .. //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#7 edit .. //depot/projects/openpam/lib/pam_sm_authenticate.c#7 edit .. //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#6 edit .. //depot/projects/openpam/lib/pam_sm_chauthtok.c#8 edit .. //depot/projects/openpam/lib/pam_sm_close_session.c#7 edit .. //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#6 edit .. //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#6 edit .. //depot/projects/openpam/lib/pam_sm_open_session.c#7 edit .. //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#6 edit .. //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#6 edit .. //depot/projects/openpam/lib/pam_sm_setcred.c#7 edit .. //depot/projects/openpam/lib/pam_start.c#18 edit .. //depot/projects/openpam/lib/pam_strerror.c#12 edit .. //depot/projects/openpam/lib/pam_verror.c#8 edit .. //depot/projects/openpam/lib/pam_vinfo.c#8 edit .. //depot/projects/openpam/lib/pam_vprompt.c#12 edit .. //depot/projects/openpam/misc/gendoc.pl#25 edit .. //depot/projects/openpam/modules/Makefile#9 edit .. //depot/projects/openpam/modules/pam_deny/Makefile#6 edit .. //depot/projects/openpam/modules/pam_deny/pam_deny.c#8 edit .. //depot/projects/openpam/modules/pam_permit/Makefile#6 edit .. //depot/projects/openpam/modules/pam_permit/pam_permit.c#8 edit .. //depot/projects/openpam/modules/pam_unix/Makefile#3 edit .. //depot/projects/openpam/modules/pam_unix/pam_unix.c#5 edit Differences ... ==== //depot/projects/openpam/LICENSE#6 (text+ko) ==== @@ -1,5 +1,5 @@ -Copyright (c) 2002 Networks Associates Technology, Inc. +Copyright (c) 2002-2003 Networks Associates Technology, Inc. All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#6 $ ==== //depot/projects/openpam/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/Makefile#7 $ +# $P4: //depot/projects/openpam/Makefile#8 $ # SUBDIR = ==== //depot/projects/openpam/bin/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/Makefile#7 $ # SUBDIR = ==== //depot/projects/openpam/bin/su/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002,2003 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/su/Makefile#7 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#8 $ # PROG = su ==== //depot/projects/openpam/bin/su/su.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/bin/su/su.c#11 $ + * $P4: //depot/projects/openpam/bin/su/su.c#12 $ */ #include ==== //depot/projects/openpam/doc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/Makefile#4 $ +# $P4: //depot/projects/openpam/doc/Makefile#5 $ # SUBDIR = ==== //depot/projects/openpam/doc/man/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#12 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#13 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl ==== //depot/projects/openpam/doc/man/pam_conv.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002-2003 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#3 $ .\" .Dd May 27, 2002 .Dt PAM_CONV 3 ==== //depot/projects/openpam/include/security/openpam.h#24 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#23 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#24 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_appl.h#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_appl.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#13 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_constants.h#22 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_constants.h#21 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#22 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_modules.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_modules.h#8 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#9 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_types.h#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#10 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#11 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/openpam/lib/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002,2003 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/lib/Makefile#20 $ +# $P4: //depot/projects/openpam/lib/Makefile#21 $ # LIB = pam ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#8 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#9 $ */ #include ==== //depot/projects/openpam/lib/openpam_dispatch.c#21 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#20 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#21 $ */ #include ==== //depot/projects/openpam/lib/openpam_dynamic.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#13 $ */ #include ==== //depot/projects/openpam/lib/openpam_findenv.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_findenv.c#11 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#12 $ */ #include ==== //depot/projects/openpam/lib/openpam_free_data.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_free_data.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_free_data.c#5 $ */ #include ==== //depot/projects/openpam/lib/openpam_get_option.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_get_option.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#10 $ */ #include ==== //depot/projects/openpam/lib/openpam_load.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_load.c#18 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#19 $ */ #include ==== //depot/projects/openpam/lib/openpam_log.c#23 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_log.c#22 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#23 $ */ #include ==== //depot/projects/openpam/lib/openpam_nullconv.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#6 $ */ #include ==== //depot/projects/openpam/lib/openpam_restore_cred.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#8 $ */ #include ==== //depot/projects/openpam/lib/openpam_set_option.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_set_option.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#13 $ */ #include ==== //depot/projects/openpam/lib/openpam_static.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_static.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#6 $ */ #include ==== //depot/projects/openpam/lib/openpam_ttyconv.c#20 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#19 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#20 $ */ #include ==== //depot/projects/openpam/lib/pam_acct_mgmt.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#14 $ */ #include ==== //depot/projects/openpam/lib/pam_authenticate.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_authenticate.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#15 $ */ #include ==== //depot/projects/openpam/lib/pam_authenticate_secondary.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#8 $ */ #include ==== //depot/projects/openpam/lib/pam_chauthtok.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#15 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#16 $ */ #include ==== //depot/projects/openpam/lib/pam_close_session.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_close_session.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#13 $ */ #include ==== //depot/projects/openpam/lib/pam_end.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_end.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_end.c#13 $ */ #include ==== //depot/projects/openpam/lib/pam_error.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_error.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_error.c#10 $ */ #include ==== //depot/projects/openpam/lib/pam_get_authtok.c#25 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#24 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#25 $ */ #include ==== //depot/projects/openpam/lib/pam_get_data.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#12 $ */ #include ==== //depot/projects/openpam/lib/pam_get_item.c#17 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_item.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#17 $ */ #include ==== //depot/projects/openpam/lib/pam_get_mapped_authtok.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c#8 $ */ #include ==== //depot/projects/openpam/lib/pam_get_mapped_username.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c#8 $ */ #include ==== //depot/projects/openpam/lib/pam_get_user.c#17 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#17 $ */ #include ==== //depot/projects/openpam/lib/pam_getenv.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#15 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#16 $ */ #include ==== //depot/projects/openpam/lib/pam_getenvlist.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#12 $ */ #include ==== //depot/projects/openpam/lib/pam_info.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_info.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_info.c#9 $ */ #include ==== //depot/projects/openpam/lib/pam_open_session.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_open_session.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#13 $ */ #include ==== //depot/projects/openpam/lib/pam_prompt.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_prompt.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_prompt.c#9 $ */ #include ==== //depot/projects/openpam/lib/pam_putenv.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_putenv.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#12 $ */ #include ==== //depot/projects/openpam/lib/pam_set_data.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_data.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#15 $ */ #include ==== //depot/projects/openpam/lib/pam_set_item.c#21 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002,2003 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_item.c#20 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#21 $ */ #include ==== //depot/projects/openpam/lib/pam_set_mapped_authtok.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 7 04:35:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 720CB37B404; Sat, 7 Jun 2003 04:35:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2301E37B401 for ; Sat, 7 Jun 2003 04:35:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 792C243F3F for ; Sat, 7 Jun 2003 04:35:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h57BZ70U035835 for ; Sat, 7 Jun 2003 04:35:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h57BZ6am035822 for perforce@freebsd.org; Sat, 7 Jun 2003 04:35:06 -0700 (PDT) Message-Id: <200306071135.h57BZ6am035822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 32741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sat, 07 Jun 2003 11:35:09 -0000 X-Original-Date: Sat, 7 Jun 2003 04:35:06 -0700 (PDT) X-List-Received-Date: Sat, 07 Jun 2003 11:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=32741 Change 32741 by jmallett@jmallett_dalek on 2003/06/07 04:34:36 Move out a fair bit of code to tlb.c, and cripple a few things along the way. Easier this way for now... Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#16 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#16 (text+ko) ==== @@ -113,15 +113,8 @@ #include #include +#include -/* - * The joy of indexing. - * - * User addresses don't have the bits set that XKSEG has, best way to - * index the page table is to remove those bits, and get a page number. - */ -#define pmap_index(va) (((va) & ~VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT) - #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif @@ -153,7 +146,6 @@ #define pmap_pte_pa(pte) MIPS_PTE_TO_PA(*(pte)) #define pmap_pte_prot(pte) (*(pte) & PG_PROT) -#define pmap_pte_set_w(pte, v) ((v)?(*pte |= PG_W):(*pte &= ~PG_W)) #define pmap_pte_set_prot(pte, v) ((*pte &= ~PG_PROT), (*pte |= (v))) /* @@ -189,9 +181,6 @@ */ #define pmap_k0seg_to_pte(va) MIPS_PA_TO_PFN(pmap_k0seg_to_pfn(va)) -pt_entry_t *kptmap; -vm_size_t kptsize; - /* * Statically allocated kernel pmap */ @@ -228,7 +217,6 @@ static pv_entry_t get_pv_entry(void); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); -static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m); @@ -245,7 +233,7 @@ { if (pmap == NULL || pmap->pm_lev1 == NULL) return NULL; - return &pmap->pm_lev1[pmap_index(va)]; + return tlb_pte_find(pmap->pm_lev1, va); } @@ -292,36 +280,23 @@ * Bootstrap the system enough to run with virtual memory. * * This sets up the ASID generator, message buffer, and page - * table. XXX Probably want to move page table and related to - * a TLB-specific file. It also sets up some very important - * values for MI VM code to run. + * table. */ void pmap_bootstrap(void) { - pt_entry_t *pte; int i; /* - * Setup ASIDs. PCPU_GET(next_asid) and PCPU_GET(current_asidgen) are set - * up already. - */ - pmap_maxasid = MIPS3_TLB_NUM_ASIDS; - - /* * Steal the message buffer from the beginning of memory. */ msgbufp = (struct msgbuf *) pmap_steal_memory(MSGBUF_SIZE); msgbufinit(msgbufp, MSGBUF_SIZE); /* - * Set up kernel page table. + * Initialise TLB management, and have it allocate page tables. */ - kptsize = physsz >> PAGE_SHIFT; - printf("Kernel page table indexes %ld %dK pages.\n", - kptsize, PAGE_SIZE / 1024); - kptmap = (pt_entry_t *) - pmap_steal_memory(kptsize * sizeof (pt_entry_t)); + tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory); avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; @@ -345,20 +320,6 @@ */ LIST_INIT(&allpmaps); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); - - /* - * Lock in the current ASID, and set the global bit on each PTE. - */ - mips_wr_entryhi(kernel_pmap->pm_asid); - for (i = 0; i < kptsize; i++) { - pte = &kptmap[i]; - *pte = PG_G; - } - - /* - * Clear the TLB. - */ - MIPS_TBIAP(); } /* @@ -616,48 +577,35 @@ ***************************************************/ /* - * Add a list of wired pages to the kva - * this routine is only used for temporary - * kernel mappings that do not need to have - * page modification or references recorded. - * Note that old mappings are simply written - * over. The page *must* be wired. + * Map a list of wired pages into kernel virtual address space. This is + * intended for temporary mappings which do not need page modification or + * references recorded. Existing mappings in the region are overwritten. */ void -pmap_qenter(vm_offset_t va, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) { - int i; - pt_entry_t *pte; + vm_offset_t va; - for (i = 0; i < count; i++) { - vm_offset_t tva = va + i * PAGE_SIZE; - pt_entry_t npte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m[i])) - | PG_V; - pt_entry_t opte; - pte = pmap_pte(kernel_pmap, tva); - opte = *pte; - *pte = npte; - if (opte & PG_V) - pmap_invalidate_page(kernel_pmap, tva); + va = sva; + while (count-- > 0) { + pmap_kenter(va, *m); + va += PAGE_SIZE; + m++; } } /* - * this routine jerks page mappings from the - * kernel -- it is meant only for temporary mappings. + * Remove page mappings from kernel virtual address space. Intended for + * temporary mappings entered by pmap_qenter. */ void -pmap_qremove(va, count) +pmap_qremove(vm_offset_t sva, int count) +{ vm_offset_t va; - int count; -{ - int i; - register pt_entry_t *pte; - for (i = 0; i < count; i++) { - pte = pmap_pte(kernel_pmap, va); - *pte = 0; - pmap_invalidate_page(kernel_pmap, va); + va = sva; + while (count-- > 0) { + pmap_kremove(va); va += PAGE_SIZE; } } @@ -670,16 +618,8 @@ PMAP_INLINE void pmap_kenter(vm_offset_t va, vm_offset_t pa) { - pt_entry_t *pte; - pt_entry_t npte, opte; - npte = pmap_phys_to_pte(pa) | PG_V; - pte = pmap_pte(kernel_pmap, va); - opte = *pte; - *pte = npte; - if (opte & PG_V) - pmap_invalidate_page(kernel_pmap, va); - MachTLBUpdate(va & ~PAGE_MASK, npte); + tlb_enter(kernel_pmap, va, pa, PG_V | PG_W); } /* @@ -688,11 +628,8 @@ PMAP_INLINE void pmap_kremove(vm_offset_t va) { - register pt_entry_t *pte; - pte = pmap_pte(kernel_pmap, va); - *pte = 0; - pmap_invalidate_page(kernel_pmap, va); + tlb_remove(kernel_pmap, va); } /* @@ -813,18 +750,16 @@ vm_object_t ksobj; vm_offset_t ks; vm_page_t m; - pt_entry_t *ptek; pages = td->td_kstack_pages; ksobj = td->td_kstack_obj; ks = td->td_kstack; - ptek = pmap_pte(kernel_pmap, ks); + + tlb_remove_pages(kernel_pmap, ks, pages); for (i = 0; i < pages; i++) { m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_dispose_thread: kstack already missing?"); - ptek[i] = 0; - pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); vm_page_lock_queues(); vm_page_busy(m); vm_page_unwire(m, 0); @@ -1217,31 +1152,6 @@ } /* - * Remove a single page from a process address space - */ -static void -pmap_remove_page(pmap_t pmap, vm_offset_t va) -{ - register pt_entry_t *ptq; - - ptq = pmap_pte(pmap, va); - - /* - * if there is no pte for this address, just skip it!!! - */ - if (!ptq || !pmap_pte_v(ptq)) - return; - - /* - * get a local va for mappings for this pmap. - */ - (void) pmap_remove_pte(pmap, ptq, va); - pmap_invalidate_page(pmap, va); - - return; -} - -/* * Remove the given range of addresses from the specified map. * * It is assumed that the start and end are properly @@ -1250,7 +1160,6 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - vm_offset_t va, nva; if (pmap == NULL) return; @@ -1258,20 +1167,7 @@ if (pmap->pm_stats.resident_count == 0) return; - /* - * special handling of removing one page. a very - * common operation and easy to short circuit some - * code. - */ - if (sva + PAGE_SIZE == eva) { - pmap_remove_page(pmap, sva); - return; - } - - for (va = sva; va < eva; va = nva) { - pmap_remove_page(pmap, va); - nva = va + PAGE_SIZE; - } + tlb_remove_range(pmap, sva, eva); } /* @@ -1371,7 +1267,7 @@ while (sva < eva) { /* - * If level pte is invalid, skip this page + * If pte is invalid, skip this page */ pte = pmap_pte(pmap, sva); if (!pmap_pte_v(pte)) { @@ -1421,9 +1317,7 @@ vm_offset_t pa; pt_entry_t *pte; vm_offset_t opa; - pt_entry_t origpte, newpte; vm_page_t mpte; - int managed; if (pmap == NULL) return; @@ -1452,59 +1346,38 @@ panic("pmap_enter: invalid kernel page tables pmap=%p, va=0x%lx\n", pmap, va); } - origpte = *pte; pa = VM_PAGE_TO_PHYS(m) & ~PAGE_MASK; - managed = 0; - opa = pmap_pte_pa(pte); - /* - * Mapping has not changed, must be protection or wiring change. - */ - if (origpte & PG_V && (opa == pa)) { + if (pte_valid(pte) && (opa = MIPS_PTE_TO_PA(*pte)) == pa) { + if (pte_wired(pte)) { + if (!wired) + pmap->pm_stats.wired_count--; + } else { + if (wired) + pmap->pm_stats.wired_count++; + } + if (pte_dirty(pte)) { + /* + * If it's not read-only, is managed, and modified, dirty it. + */ + if (pte_managed(pte) && !pte_ro(pte) && pte_dirty(pte)) { + KASSERT(pmap_track_modified(va), ("pmap modified")); + vm_page_dirty(PHYS_TO_VM_PAGE(opa)); + } + } + } else { /* - * Wiring change, just update stats. We don't worry about - * wiring PT pages as they remain resident as long as there - * are valid mappings in them. Hence, if a user page is wired, - * the PT page will be also. + * Valid but not the same page, we need to change the mapping. */ - if (wired && ((origpte & PG_W) == 0)) - pmap->pm_stats.wired_count++; - else if (!wired && (origpte & PG_W)) - pmap->pm_stats.wired_count--; + if (pte_valid(pte)) { + int err; - /* - * Remove extra pte reference - */ - if (mpte) - mpte->hold_count--; - - /* - * We might be turning off write access to the page, - * so we go ahead and sense modify status. - */ - if (pmap_pte_managed(&origpte)) { - if ((origpte & PG_RO) != PG_RO - && pmap_track_modified(va)) { - vm_page_t om; - om = PHYS_TO_VM_PAGE(opa); - vm_page_dirty(om); - } - managed = 1; + vm_page_lock_queues(); + err = pmap_remove_pte(pmap, pte, va); + vm_page_unlock_queues(); + if (err) + panic("pmap_enter: pte vanished, va: 0x%lx", va); } - - goto validate; - } - /* - * Mapping has changed, invalidate old range and fall through to - * handle validating new mapping. - */ - if (opa) { - int err; - vm_page_lock_queues(); - err = pmap_remove_pte(pmap, pte, va); - vm_page_unlock_queues(); - if (err) - panic("pmap_enter: pte vanished, va: 0x%lx", va); } /* @@ -1514,7 +1387,6 @@ */ if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) { pmap_insert_entry(pmap, va, mpte, m); - managed |= PG_M; } /* @@ -1524,39 +1396,7 @@ if (wired) pmap->pm_stats.wired_count++; -validate: - /* - * Now validate mapping with desired protection/wiring. - */ - newpte = pmap_phys_to_pte(pa) | pte_prot(pmap, prot) | PG_V | managed; - - if (managed) { - /* - * Set up referenced/modified emulation for the new - * mapping. Any old referenced/modified emulation - * results for the old mapping will have been recorded - * either in pmap_remove_pte() or above in the code - * which handles protection and/or wiring changes. - */ - newpte |= (PG_RO | PG_D); - } - - if (wired) - newpte |= PG_W; - - /* - * if the mapping or permission bits are different, we need - * to update the pte. - */ - if (origpte != newpte) { - if ((newpte & PG_V) == 0) - panic("pmap_enter invalid mapping?\n"); - *pte = newpte; - if (origpte & PG_V) - pmap_invalidate_page(pmap, va); - if (prot & VM_PROT_EXECUTE) - /* XXX invalidate Icache */; - } + tlb_enter(pmap, va, pa, PG_V | (wired ? PG_W : 0)); } /* @@ -1617,16 +1457,17 @@ pte = pmap_pte(pmap, va); - if (wired && !pmap_pte_w(pte)) - pmap->pm_stats.wired_count++; - else if (!wired && pmap_pte_w(pte)) - pmap->pm_stats.wired_count--; - - /* - * Wiring is not a hardware characteristic so there is no need to - * invalidate TLB. - */ - pmap_pte_set_w(pte, wired); + if (pte_wired(pte)) { + if (!wired) + pmap->pm_stats.wired_count--; + } else { + if (wired) + pmap->pm_stats.wired_count++; + } + if (wired) + pte_wire(pte); + else + pte_unwire(pte); } @@ -2146,43 +1987,4 @@ return addr; } -/* - * PTE was not dirty and is being written to. XXX kernel only for now. - */ -void -pmap_tlb_modified(void *badvaddr) -{ - pt_entry_t *pte, entry; - vm_offset_t va; - va = (vm_offset_t) badvaddr; - pte = pmap_pte(kernel_pmap, va); - /* - * Do we really want to dirty this page? - */ -#if 0 /* XXX ? */ - if (!pmap_pte_managed(pte)) - panic("tlb modified unmanaged page"); -#endif - if (!pmap_pte_v(pte)) - panic("tlb modified invalid page"); - if (pmap_pte_ro(pte)) - panic("write to ro page"); - if (*pte & PG_D) - panic("dirty page caused a TLBMod"); - /* - * Mark the page dirty. - */ - *pte |= PG_D; - - /* - * Make a PTE purely to insert into the TLB. - */ - entry = *pte & MIPS_PFN_MASK; - entry |= *pte & 0x07; /* XXX PG_??? */ - - /* - * Lock in the TLB entry for this page. - */ - MachTLBUpdate(va & ~PAGE_MASK, *pte); -} From owner-p4-projects@FreeBSD.ORG Wed Jul 2 22:34:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 224B837B404; Wed, 2 Jul 2003 22:34:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7D8937B401 for ; Wed, 2 Jul 2003 22:34:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64C0243F85 for ; Wed, 2 Jul 2003 22:34:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h635YX0U099649 for ; Wed, 2 Jul 2003 22:34:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h635YWqU099646 for perforce@freebsd.org; Wed, 2 Jul 2003 22:34:32 -0700 (PDT) Date: Wed, 2 Jul 2003 22:34:32 -0700 (PDT) Message-Id: <200307030534.h635YWqU099646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2003 05:34:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=34005 Change 34005 by marcel@marcel_nfs on 2003/07/02 22:34:06 IFC @34004 Affected files ... .. //depot/projects/ia64/Makefile.inc1#70 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#9 integrate .. //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/telnetd/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#7 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#5 integrate .. //depot/projects/ia64/lib/libc_r/arch/alpha/_atomic_lock.S#2 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#10 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#13 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#11 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#14 integrate .. //depot/projects/ia64/sbin/Makefile#27 integrate .. //depot/projects/ia64/sbin/mount_nwfs/Makefile#3 delete .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.8#7 delete .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.c#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/Makefile#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/activate.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/conf.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.8#4 delete .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.c#4 delete .. //depot/projects/ia64/sbin/mount_portalfs/pathnames.h#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/portal.conf#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/portald.h#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_conf.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_exec.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_file.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_tcp.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_tcplisten.c#2 delete .. //depot/projects/ia64/sbin/mount_smbfs/Makefile#3 delete .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#10 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#15 integrate .. //depot/projects/ia64/share/man/man4/umass.4#10 integrate .. //depot/projects/ia64/share/mk/bsd.dep.mk#11 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#23 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#18 integrate .. //depot/projects/ia64/share/mk/sys.mk#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#10 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.s#2 delete .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#9 integrate .. //depot/projects/ia64/sys/conf/files.ia64#41 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#7 integrate .. //depot/projects/ia64/sys/dev/ppc/ppc.c#1 branch .. //depot/projects/ia64/sys/dev/ppc/ppcreg.h#1 branch .. //depot/projects/ia64/sys/dev/random/randomdev.c#9 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#46 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#14 integrate .. //depot/projects/ia64/sys/i386/bios/apm.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/context.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/context.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/exception.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/exception.s#26 delete .. //depot/projects/ia64/sys/ia64/ia64/locore.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/locore.s#17 delete .. //depot/projects/ia64/sys/ia64/ia64/pal.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/pal.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/setjmp.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/setjmp.s#2 delete .. //depot/projects/ia64/sys/ia64/ia64/support.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/support.s#9 delete .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#12 delete .. //depot/projects/ia64/sys/isa/atkbdc_isa.c#4 integrate .. //depot/projects/ia64/sys/isa/fd.c#19 integrate .. //depot/projects/ia64/sys/isa/isahint.c#3 integrate .. //depot/projects/ia64/sys/isa/syscons_isa.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#25 integrate .. //depot/projects/ia64/sys/kern/subr_hints.c#6 integrate .. //depot/projects/ia64/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#7 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#16 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#20 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#24 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons_pc98.c#5 integrate .. //depot/projects/ia64/sys/sys/bus.h#9 integrate .. //depot/projects/ia64/usr.sbin/Makefile#43 integrate .. //depot/projects/ia64/usr.sbin/mount_nwfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.8#1 branch .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/activate.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/conf.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/mount_portalfs.8#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/mount_portalfs.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pathnames.h#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/portal.conf#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/portald.h#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_conf.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_exec.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_file.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_tcp.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_tcplisten.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_smbfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/watchdogd/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#70 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.373 2003/07/01 23:10:39 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.374 2003/07/02 19:26:19 gordon Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -667,7 +667,7 @@ _yacc= usr.bin/yacc .endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ +.if exists(${.CURDIR}/rescue) && defined(RESCUE) && \ ${BOOTSTRAPPING} < 501100 _crunchgen= usr.sbin/crunch/crunchgen .endif @@ -752,7 +752,7 @@ _btxld= usr.sbin/btxld .endif -.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ +.if (exists(${.CURDIR}/rescue) && defined(RESCUE) || \ defined(RELEASEDIR)) && \ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) _crunchide= usr.sbin/crunch/crunchide ==== //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#4 (text+ko) ==== @@ -135,6 +135,12 @@ .tty-char \[rf] _| .tty-char \[lc] |~ .tty-char \[rc] ~| +.tty-char \[lb] `- +.tty-char \[rb] -' +.tty-char \[lk] { +.tty-char \[rk] } +.tty-char \[lt] ,- +.tty-char \[rt] -. .\" Latin-1 characters .tty-char \[r!] \z,i .tty-char \[Po] \z-L ==== //depot/projects/ia64/kerberos5/Makefile.inc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.16 2003/06/18 14:23:44 mr Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.17 2003/07/02 23:46:37 ru Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -45,9 +45,9 @@ .endif .if exists(${.OBJDIR}/../../lib/libvers) -VERSOBJDIR= ${.OBJDIR}/../../lib/libvers +LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a .else -VERSOBJDIR= ${.CURDIR}/../../lib/libvers +LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a .endif .if exists(${.OBJDIR}/../../lib/libkrb5) @@ -56,40 +56,10 @@ KRB5OBJDIR= ${.CURDIR}/../../lib/libkrb5 .endif -.if exists(${.OBJDIR}/../../lib/libkadm5clnt) -KADM5COBJDIR= ${.OBJDIR}/../../lib/libkadm5clnt -.else -KADM5COBJDIR= ${.CURDIR}/../../lib/libkadm5clnt -.endif - -.if exists(${.OBJDIR}/../../lib/libkadm5srv) -KADM5SOBJDIR= ${.OBJDIR}/../../lib/libkadm5srv -.else -KADM5SOBJDIR= ${.CURDIR}/../../lib/libkadm5srv -.endif - -.if exists(${.OBJDIR}/../../lib/libkafs5) -KAFS5OBJDIR= ${.OBJDIR}/../../lib/libkafs5 -.else -KAFS5OBJDIR= ${.CURDIR}/../../lib/libkafs5 -.endif - -.if exists(${.OBJDIR}/../../lib/libkrb5util) -KRB5UTILOBJDIR= ${.OBJDIR}/../../lib/libkrb5util -.else -KRB5UTILOBJDIR= ${.CURDIR}/../../lib/libkrb5util -.endif - -.if exists(${.OBJDIR}/../../lib/libkdb5) -KDB5OBJDIR= ${.OBJDIR}/../../lib/libkdb5 -.else -KDB5OBJDIR= ${.CURDIR}/../../lib/libkdb5 -.endif - .if exists(${.OBJDIR}/../../lib/libsl) -SLOBJDIR= ${.OBJDIR}/../../lib/libsl +LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a .else -SLOBJDIR= ${.CURDIR}/../../lib/libsl +LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif .if exists(${.OBJDIR}/../../lib/libtelnet) ==== //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.8 2003/03/09 21:56:51 markm Exp $ +# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.9 2003/07/02 23:46:37 ru Exp $ PROG= hprop SRCS= hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h @@ -12,11 +12,9 @@ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hprop.8 ==== //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.10 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.11 2003/07/02 23:46:37 ru Exp $ PROG= hpropd SRCS= hpropd.c hprop.h hdb_err.h @@ -13,11 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= hpropd.8 ==== //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.11 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.12 2003/07/02 23:46:37 ru Exp $ PROG= ipropd-master SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -13,13 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.11 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.12 2003/07/02 23:46:37 ru Exp $ PROG= ipropd-slave SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -13,13 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.12 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.13 2003/07/02 23:46:37 ru Exp $ PROG= kadmind SRCS= kadmind.c server.c kadm_conn.c \ @@ -15,14 +15,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.11 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.12 2003/07/02 23:46:38 ru Exp $ PROG= kdc SRCS= \ @@ -21,11 +21,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kdc.8 ==== //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.13 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.14 2003/07/02 23:46:37 ru Exp $ PROG= kpasswdd SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ @@ -14,11 +14,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kpasswdd.8 ==== //depot/projects/ia64/kerberos5/libexec/telnetd/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.17 2003/03/09 21:56:53 markm Exp $ +# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.18 2003/07/02 23:46:38 ru Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -20,8 +20,7 @@ ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \ ${LIBCRYPT} ${LIBPAM} LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \ - -L${ROKENOBJDIR} -lroken -lcom_err \ + -lkrb5 -lasn1 -lroken -lcom_err \ -lcrypt ${MINUSLPAM} .include ==== //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.13 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.14 2003/07/02 23:46:38 ru Exp $ PROG= kadmin SRCS= \ @@ -34,16 +34,13 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${SLOBJDIR} -lsl -lreadline -lcurses ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ +LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \ + ${LIBVERS} -lhdb -lasn1 \ + -lcrypto -lcrypt -lcom_err \ + ${LIBSL} -lreadline -lcurses ${LDAPLDADD} +DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \ + ${LIBVERS} ${LIBHDB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ ${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS} MAN= kadmin.8 ==== //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kdestroy SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h @@ -10,11 +10,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kinit SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \ @@ -11,11 +11,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= klist SRCS= klist.c krb5_err.h heim_err.h k524_err.h @@ -10,11 +10,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kpasswd SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h @@ -9,10 +9,9 @@ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.8 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.9 2003/07/02 23:46:38 ru Exp $ PROG= ksu SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h @@ -11,11 +11,9 @@ -I${ASN1OBJDIR} \ -I${.OBJDIR} NOMAN= true -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .if defined(ENABLE_SUID_K5SU) BINMODE=4555 ==== //depot/projects/ia64/kerberos5/usr.bin/telnet/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.18 2003/03/09 21:56:55 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.19 2003/07/02 23:46:38 ru Exp $ PROG= telnet @@ -17,8 +17,7 @@ ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} LDADD= -ltermcap ${LIBTELNET} -lmp \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \ - -L${ROKENOBJDIR} -lroken \ + -lkrb5 -lasn1 -lcom_err -lroken \ -lcrypto -lcrypt -lipsec ${MINUSLPAM} .include ==== //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.12 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.13 2003/07/02 23:46:39 ru Exp $ PROG= kstash SRCS= kstash.c hdb_err.h @@ -12,12 +12,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${HDBOBJDIR} -lhdb \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kstash.8 ==== //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.12 2003/05/11 18:49:29 markm Exp $ +# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.13 2003/07/02 23:46:39 ru Exp $ PROG= ktutil SRCS= \ @@ -25,16 +25,12 @@ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ - -lcrypto -lcrypt -lcom_err -lreadline -lcurses -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ - ${LIBCURSES} +LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \ + ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \ + -lreadline -lcurses +DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBCURSES} MAN= ktutil.8 .include ==== //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.21 2002/09/17 11:28:24 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $"); #include #include @@ -50,7 +50,7 @@ { size_t on; int ret; - char dummy; + char dummy[2]; FILE f; struct __sFILEX ext; @@ -61,8 +61,10 @@ n = INT_MAX; /* Stdio internals do not deal correctly with zero length buffer */ if (n == 0) { - str = &dummy; - n = 1; + if (on > 0) + *str = '\0'; + str = dummy; + n = 1; } f._file = -1; f._flags = __SWR | __SSTR; ==== //depot/projects/ia64/lib/libc_r/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/Makefile,v 1.33 2003/07/01 15:07:01 ru Exp $ +# $FreeBSD: src/lib/libc_r/Makefile,v 1.35 2003/07/02 13:27:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does ==== //depot/projects/ia64/lib/libc_r/arch/alpha/_atomic_lock.S#2 (text+ko) ==== @@ -19,11 +19,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.3 1999/08/28 00:03:00 peter Exp $ + * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.4 2003/07/02 13:27:54 ru Exp $ * */ -#include "SYS.h" +#include /* * Atomicly lock a location with an identifier provided the location ==== //depot/projects/ia64/lib/libpthread/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.45 2003/07/01 15:37:35 ru Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.46 2003/07/02 20:51:30 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -35,3 +35,9 @@ .include "${.CURDIR}/thread/Makefile.inc" .include + +# Can't put thr_support.c in SRCS but want it in .depend. +${DEPENDFILE}: thr_support.c + +# LIBC_PIC is defined only after is included. +thr_libc.So: ${LIBC_PIC} ==== //depot/projects/ia64/lib/libpthread/support/Makefile.inc#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.2 2003/06/08 03:58:20 imp Exp $ +# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.4 2003/07/02 20:52:39 ru Exp $ -.PATH: ${.CURDIR}/support +.PATH: ${.CURDIR}/support -SRCS += thr_support.c -SOBJS+= thr_libc.So +SOBJS+= thr_libc.So +CLEANFILES+= thr_support.So thr_libc.So: thr_support.So - ${CC} -nostdlib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic - + ${CC} -nostdlib -o ${.TARGET} -Wl,-r thr_support.So -lc_pic ==== //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.22 2003/06/28 09:39:35 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.23 2003/07/02 13:23:03 davidxu Exp $ */ #include #include @@ -75,7 +75,7 @@ pthread->cancelflags |= THR_CANCELLING; _thr_setrunnable_unlocked(pthread); if ((joinee != NULL) && - (curthread->kseg == joinee->kseg)) { + (pthread->kseg == joinee->kseg)) { /* Remove the joiner from the joinee. */ joinee->joiner = NULL; joinee = NULL; ==== //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.45 2003/06/28 09:40:57 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.46 2003/07/02 14:12:37 davidxu Exp $ */ #include #include @@ -539,8 +539,10 @@ /* The wait timedout. */ rval = ETIMEDOUT; (void)_mutex_cv_lock(mutex); - } else if (interrupted || done) + } else if (interrupted || done) { rval = _mutex_cv_lock(mutex); + unlock_mutex = 1; + } } } break; @@ -738,7 +740,7 @@ while ((pthread = TAILQ_FIRST(&cond->c_queue)) != NULL) { TAILQ_REMOVE(&cond->c_queue, pthread, sqe); - THR_CONDQ_SET(pthread); + THR_CONDQ_CLEAR(pthread); if ((pthread->timeout == 0) && (pthread->interrupted == 0)) /* * Only exit the loop when we find a thread ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.14 2003/07/01 15:52:09 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.15 2003/07/02 02:05:23 mtm Exp $ */ #include #include @@ -85,11 +85,11 @@ /* Single underscore versions provided for libc internal usage: */ __weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); +__weak_reference(__pthread_mutex_unlock, pthread_mutex_unlock); /* No difference between libc and application usage of these: */ __weak_reference(_pthread_mutex_init, pthread_mutex_init); __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); -__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); /* @@ -505,6 +505,9 @@ return (ret); } +/* + * Libc internal. + */ int _pthread_mutex_lock(pthread_mutex_t *mutex) { @@ -513,6 +516,8 @@ if (_thread_initial == NULL) _thread_init(); + _thread_sigblock(); + if (mutex == NULL) ret = EINVAL; @@ -524,13 +529,28 @@ ((ret = mutex_init(mutex, 1)) == 0)) ret = mutex_lock_common(mutex, 0); + if (ret != 0) + _thread_sigunblock(); + return (ret); } int +__pthread_mutex_unlock(pthread_mutex_t * mutex) +{ + return (mutex_unlock_common(mutex, /* add reference */ 0)); +} + +/* + * Libc internal + */ +int _pthread_mutex_unlock(pthread_mutex_t * mutex) { - return (mutex_unlock_common(mutex, /* add reference */ 0)); + int error; + if ((error = mutex_unlock_common(mutex, /* add reference */ 0)) == 0) + _thread_sigunblock(); + return (error); } int ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#14 (text+ko) ==== @@ -1,8 +1,8 @@