From owner-p4-projects@FreeBSD.ORG Sun May 18 13:49:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78D4037B405; Sun, 18 May 2003 13:49: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 C6DEE37B409 for ; Sun, 18 May 2003 13:49:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59C0743FBD for ; Sun, 18 May 2003 13:49:01 -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 h4IKn00U012114 for ; Sun, 18 May 2003 13:49:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4IKn0Uh012107 for perforce@freebsd.org; Sun, 18 May 2003 13:49:00 -0700 (PDT) Date: Sun, 18 May 2003 13:49:00 -0700 (PDT) Message-Id: <200305182049.h4IKn0Uh012107@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 31442 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, 18 May 2003 20:49:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=31442 Change 31442 by marcel@marcel_nfs on 2003/05/18 13:48:17 Remove the PMAP tweaks from this branch. The branch is now officially dead and identical to it's parent (the ia64 branch). Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#17 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#17 (text+ko) ==== @@ -249,16 +249,16 @@ * VHPT instrumentation. */ static int pmap_vhpt_inserts; -static int pmap_vhpt_removals; -static int pmap_vhpt_updates; +static int pmap_vhpt_collisions; +static int pmap_vhpt_resident; SYSCTL_DECL(_vm_stats); SYSCTL_NODE(_vm_stats, OID_AUTO, vhpt, CTLFLAG_RD, 0, ""); SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, inserts, CTLFLAG_RD, - &pmap_vhpt_inserts, 0, "VHPT insertion counter"); -SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, removals, CTLFLAG_RD, - &pmap_vhpt_removals, 0, "VHPT removal counter"); -SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, updates, CTLFLAG_RD, - &pmap_vhpt_updates, 0, "VHPT update counter"); + &pmap_vhpt_inserts, 0, ""); +SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, collisions, CTLFLAG_RD, + &pmap_vhpt_collisions, 0, ""); +SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, resident, CTLFLAG_RD, + &pmap_vhpt_resident, 0, ""); static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); @@ -968,8 +968,12 @@ struct ia64_lpte *vhpte; pmap_vhpt_inserts++; + pmap_vhpt_resident++; - vhpte = (struct ia64_lpte *)ia64_thash(va); + vhpte = (struct ia64_lpte *) ia64_thash(va); + + if (vhpte->pte_chain) + pmap_vhpt_collisions++; pte->pte_chain = vhpte->pte_chain; vhpte->pte_chain = ia64_tpa((vm_offset_t) pte); @@ -988,14 +992,11 @@ { struct ia64_lpte *vhpte; - pmap_vhpt_updates++; + vhpte = (struct ia64_lpte *) ia64_thash(va); - vhpte = (struct ia64_lpte *)ia64_thash(va); - - if ((!vhpte->pte_p || vhpte->pte_tag == pte->pte_tag) && pte->pte_p) + if ((!vhpte->pte_p || vhpte->pte_tag == pte->pte_tag) + && pte->pte_p) pmap_install_pte(vhpte, pte); - - ia64_ptc_g(va, pte->pte_ps << 2); } /* @@ -1036,15 +1037,11 @@ } } - pmap_vhpt_removals++; - - /* Snip this pv_entry out of the collision chain. */ + /* + * Snip this pv_entry out of the collision chain. + */ lpte->pte_chain = pte->pte_chain; - /* Invalidate the entry and purge the TLB. */ - pte->pte_p = 0; - ia64_ptc_g(va, pte->pte_ps << 2); - /* * If the VHPTE matches as well, change it to map the first * element from the chain if there is one. @@ -1060,6 +1057,7 @@ } } + pmap_vhpt_resident--; error = 0; done: return error; @@ -1188,9 +1186,9 @@ pmap_find_kpte(vm_offset_t va) { KASSERT((va >> 61) == 5, - ("kernel mapping 0x%lx not in region 5", va)); + ("kernel mapping 0x%lx not in region 5", va)); KASSERT(IA64_RR_MASK(va) < (nkpt * PAGE_SIZE * NKPTEPG), - ("kernel mapping 0x%lx out of range", va)); + ("kernel mapping 0x%lx out of range", va)); return (&ia64_kptdir[KPTE_DIR_INDEX(va)][KPTE_PTE_INDEX(va)]); } @@ -1268,6 +1266,19 @@ } /* + * If a pte contains a valid mapping, clear it and update the VHPT. + */ +static void +pmap_clear_pte(struct ia64_lpte *pte, vm_offset_t va) +{ + if (pte->pte_p) { + pmap_remove_vhpt(va); + ia64_ptc_g(va, PAGE_SHIFT << 2); + pte->pte_p = 0; + } +} + +/* * Remove the (possibly managed) mapping represented by pte from the * given pmap. */ @@ -1288,6 +1299,11 @@ if (error) return error; + /* + * Make sure pmap_set_pte() knows it isn't in the VHPT. + */ + pte->pte_p = 0; + if (pte->pte_ig & PTE_IG_WIRED) pmap->pm_stats.wired_count -= 1; @@ -1357,9 +1373,13 @@ for (i = 0; i < count; i++) { vm_offset_t tva = va + i * PAGE_SIZE; + int wasvalid; pte = pmap_find_kpte(tva); - pmap_set_pte(pte, tva, VM_PAGE_TO_PHYS(m[i]), 0, PTE_PL_KERN, - PTE_AR_RWX); + wasvalid = pte->pte_p; + pmap_set_pte(pte, tva, VM_PAGE_TO_PHYS(m[i]), + 0, PTE_PL_KERN, PTE_AR_RWX); + if (wasvalid) + ia64_ptc_g(tva, PAGE_SHIFT << 2); } } @@ -1375,9 +1395,8 @@ for (i = 0; i < count; i++) { pte = pmap_find_kpte(va); - if (pte->pte_p) - pmap_remove_vhpt(va); - va += PAGE_SIZE; + pmap_clear_pte(pte, va); + va += PAGE_SIZE; } } @@ -1388,9 +1407,13 @@ pmap_kenter(vm_offset_t va, vm_offset_t pa) { struct ia64_lpte *pte; + int wasvalid; pte = pmap_find_kpte(va); + wasvalid = pte->pte_p; pmap_set_pte(pte, va, pa, 0, PTE_PL_KERN, PTE_AR_RWX); + if (wasvalid) + ia64_ptc_g(va, PAGE_SHIFT << 2); } /* @@ -1402,8 +1425,7 @@ struct ia64_lpte *pte; pte = pmap_find_kpte(va); - if (pte->pte_p) - pmap_remove_vhpt(va); + pmap_clear_pte(pte, va); } /* @@ -1609,6 +1631,7 @@ } pmap_pte_set_prot(pte, newprot); pmap_update_vhpt(pte, sva); + pmap_invalidate_page(pmap, sva); } sva += PAGE_SIZE; @@ -1729,7 +1752,7 @@ * adds the pte to the VHPT if necessary. */ pmap_set_pte(pte, va, pa, managed | (wired ? PTE_IG_WIRED : 0), - pte_prot_pl(pmap, prot), pte_prot_ar(pmap, prot)); + pte_prot_pl(pmap, prot), pte_prot_ar(pmap, prot)); /* * if the mapping or permission bits are different, we need @@ -1777,8 +1800,9 @@ /* * Initialise PTE with read-only protection and enter into VHPT. */ - pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), PTE_IG_MANAGED, PTE_PL_USER, - PTE_AR_R); + pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), + PTE_IG_MANAGED, + PTE_PL_USER, PTE_AR_R); pmap_install(oldpmap); } @@ -2223,6 +2247,7 @@ pte = pmap_find_vhpt(pv->pv_va); pmap_pte_set_prot(pte, newprot); pmap_update_vhpt(pte, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); pmap_install(oldpmap); } vm_page_flag_clear(m, PG_WRITEABLE); @@ -2260,6 +2285,7 @@ count++; pte->pte_a = 0; pmap_update_vhpt(pte, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } pmap_install(oldpmap); } @@ -2336,6 +2362,7 @@ if (pte->pte_d) { pte->pte_d = 0; pmap_update_vhpt(pte, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } pmap_install(oldpmap); } @@ -2360,6 +2387,7 @@ if (pte->pte_a) { pte->pte_a = 0; pmap_update_vhpt(pte, pv->pv_va); + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } pmap_install(oldpmap); } From owner-p4-projects@FreeBSD.ORG Mon May 19 01:10:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D39E737B404; Mon, 19 May 2003 01:10:23 -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 6937537B401 for ; Mon, 19 May 2003 01:10:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4505643FA3 for ; Mon, 19 May 2003 01:10:22 -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 h4J8AM0U068332 for ; Mon, 19 May 2003 01:10:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4J8ALc0068319 for perforce@freebsd.org; Mon, 19 May 2003 01:10:21 -0700 (PDT) Date: Mon, 19 May 2003 01:10:21 -0700 (PDT) Message-Id: <200305190810.h4J8ALc0068319@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 31465 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, 19 May 2003 08:10:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=31465 Change 31465 by marcel@marcel_nfs on 2003/05/19 01:09:39 IFC @31464 Affected files ... .. //depot/projects/ia64/Makefile.inc1#61 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#13 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#6 integrate .. //depot/projects/ia64/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#5 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.3#6 integrate .. //depot/projects/ia64/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/ia64/lib/libgeom/Makefile#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.1#8 integrate .. //depot/projects/ia64/release/Makefile#51 integrate .. //depot/projects/ia64/release/alpha/dokern.sh#9 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#13 integrate .. //depot/projects/ia64/release/alpha/fixit_crunch.conf#5 integrate .. //depot/projects/ia64/release/i386/dokern.sh#18 integrate .. //depot/projects/ia64/release/i386/fixit_crunch.conf#6 integrate .. //depot/projects/ia64/release/ia64/doFS.sh#5 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#11 integrate .. //depot/projects/ia64/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/ia64/release/pc98/fixit_crunch.conf#6 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#17 integrate .. //depot/projects/ia64/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/ia64/sbin/Makefile#25 integrate .. //depot/projects/ia64/sbin/bsdlabel/Makefile#5 integrate .. //depot/projects/ia64/sbin/devd/devd.8#8 integrate .. //depot/projects/ia64/sbin/gbde/Makefile#6 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#9 integrate .. //depot/projects/ia64/sbin/mount/mount.8#12 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#9 integrate .. //depot/projects/ia64/sbin/raidctl/raidctl.8#5 integrate .. //depot/projects/ia64/sbin/sunlabel/Makefile#7 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#9 integrate .. //depot/projects/ia64/share/man/man4/Makefile#44 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#7 integrate .. //depot/projects/ia64/share/man/man4/ehci.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/ia64/share/man/man4/my.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#37 integrate .. //depot/projects/ia64/share/man/man9/signal.9#3 integrate .. //depot/projects/ia64/share/mk/bsd.README#6 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#17 integrate .. //depot/projects/ia64/sys/conf/options#52 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#37 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#15 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#35 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#69 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#62 integrate .. //depot/projects/ia64/sys/ia64/ia64/swtch.s#14 delete .. //depot/projects/ia64/sys/ia64/include/pmap.h#13 integrate .. //depot/projects/ia64/sys/ia64/include/rse.h#2 delete .. //depot/projects/ia64/sys/sys/ata.h#9 integrate .. //depot/projects/ia64/sys/sys/mutex.h#13 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#54 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#21 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#38 integrate .. //depot/projects/ia64/tools/make_libdeps.sh#4 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#10 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#9 integrate .. //depot/projects/ia64/tools/tools/tinderbox/www/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/www/index.cgi#3 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#7 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#13 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#6 integrate .. //depot/projects/ia64/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#17 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#61 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.357 2003/05/15 17:59:32 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.360 2003/05/18 20:22:26 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -284,6 +284,8 @@ usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${WORLDTMP}/usr/include ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -789,7 +791,8 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libpam lib/libradius \ lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ ==== //depot/projects/ia64/etc/rc.d/Makefile#13 (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.15 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.16 2003/05/18 03:34:24 mtm Exp $ .include @@ -7,7 +7,7 @@ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ - ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref \ + ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localdaemons lomac lpd motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \ network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ==== //depot/projects/ia64/etc/rc.d/ldconfig#6 (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.5 2003/04/30 07:12:09 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $ # # PROVIDE: ldconfig @@ -20,8 +20,9 @@ { case ${OSTYPE} in FreeBSD) + _ins= ldconfig=${ldconfig_command} - checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i" + checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then _LDC=/usr/lib for i in ${ldconfig_paths}; do @@ -30,7 +31,7 @@ fi done echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} + ${ldconfig} -elf ${_ins} ${_LDC} # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in @@ -44,7 +45,7 @@ fi done echo 'a.out ldconfig path:' ${_LDC} - ${ldconfig} -aout ${_LDC} + ${ldconfig} -aout ${_ins} ${_LDC} ;; esac fi ==== //depot/projects/ia64/lib/libc/gen/dlinfo.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.4 2003/03/24 16:07:19 charnier Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $ .\" .Dd February 14, 2003 .Os @@ -195,7 +195,7 @@ dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); while (map != NULL) { - printf("%p: %s\n", map->l_addr, map->l_name); + printf("%p: %s\\n", map->l_addr, map->l_name); map = map->l_next; } .Ed @@ -227,7 +227,7 @@ path = &info->dls_serpath[0]; for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { - (void) printf("%2d: %s\n", cnt, path->dls_name); + (void) printf("%2d: %s\\n", cnt, path->dls_name); } .Ed .Sh RETURN VALUES ==== //depot/projects/ia64/lib/libc/gen/getfsent.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.12 2003/04/07 22:59:12 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $ .\" .Dd April 7, 2003 .Dt GETFSENT 3 @@ -182,7 +182,7 @@ and .Fn getfstab functions appeared in -.Fx 5.1. +.Fx 5.1 . .Sh BUGS These functions use static data storage; if the data is needed for future use, it should be ==== //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $ .\" .Dd July 27, 1998 .Os @@ -110,7 +110,7 @@ .Pp .Fa state will contain the state of the VME flag on return. -\" .It Dv VM86_SET_VME +.\" .It Dv VM86_SET_VME .El .Pp vm86 mode is entered by calling ==== //depot/projects/ia64/lib/libc/net/nsdispatch.3#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.9 2003/04/17 14:14:22 nectar Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -238,7 +238,8 @@ "nsswitch.conf\*(lp4\*(rp" manual pages. The -.Fx Project +.Fx +Project added the support for threads and NSS modules, and normalized the uses of .Fn nsdispatch ==== //depot/projects/ia64/lib/libc/rpc/svc_generic.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.4 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.5 2003/05/18 15:07:25 mbr Exp $"); /* * svc_generic.c, Server side for RPC. @@ -245,7 +245,7 @@ _listen(fd, SOMAXCONN); } else { if (_bind(fd, - (struct sockaddr *)(void *)&bindaddr->addr.buf, + (struct sockaddr *)bindaddr->addr.buf, (socklen_t)si.si_alen) < 0) { warnx( "svc_tli_create: could not bind to requested address"); ==== //depot/projects/ia64/lib/libgeom/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.5 2003/03/23 10:15:02 phk Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $ LIB= geom SRCS+= geom_getxml.c @@ -11,6 +11,9 @@ WARNS?= 3 +DPADD= ${LIBBSDXML} ${LIBSBUF} +LDADD= -lbsdxml -lsbuf + MAN= libgeom.3 MLINKS+= \ ==== //depot/projects/ia64/libexec/rtld-elf/libmap.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.3 2003/04/30 19:05:53 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.4 2003/05/19 07:10:12 mdodd Exp $ */ #include @@ -9,6 +9,9 @@ #include #include +#include "debug.h" +#include "rtld.h" + #ifndef _PATH_LIBMAP_CONF #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #endif @@ -119,7 +122,7 @@ if (!iseol(*cp)) continue; *cp = '\0'; - lm_add(p, strdup(f), strdup(t)); + lm_add(p, xstrdup(f), xstrdup(t)); } fclose(fp); return; @@ -169,9 +172,9 @@ #endif if ((lml = lmp_find(p)) == NULL) - lml = lmp_init(strdup(p)); + lml = lmp_init(xstrdup(p)); - lm = malloc(sizeof(struct lm)); + lm = xmalloc(sizeof(struct lm)); lm->f = f; lm->t = t; TAILQ_INSERT_HEAD(lml, lm, lm_link); @@ -185,8 +188,14 @@ if (p != NULL && (lml = lmp_find(p)) != NULL) { t = lml_find(lml, f); - if (t != NULL) + if (t != NULL) { + /* + * Add a global mapping if we have + * a successful constrained match. + */ + lm_add(NULL, xstrdup(f), xstrdup(t)); return (t); + } } lml = lmp_find("$DEFAULT$"); if (lml != NULL) @@ -224,7 +233,7 @@ { struct lmp *lmp; - lmp = malloc(sizeof(struct lmp)); + lmp = xmalloc(sizeof(struct lmp)); lmp->p = n; TAILQ_INIT(&lmp->lml); TAILQ_INSERT_HEAD(&lmp_head, lmp, lmp_link); ==== //depot/projects/ia64/libexec/rtld-elf/rtld.1#8 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.33 2003/05/16 21:34:21 ru Exp $ +.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.34 2003/05/17 19:46:49 rwatson Exp $ .\" .\" Copyright (c) 1995 Paul Kranenburg .\" All rights reserved. @@ -165,4 +165,5 @@ .Xr ld 1 , .Xr ldd 1 , .Xr elf 5 , +.Xr libmap.conf 5 , .Xr ldconfig 8 ==== //depot/projects/ia64/release/Makefile#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $ +# $FreeBSD: src/release/Makefile,v 1.777 2003/05/18 19:34:03 jmallett Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -216,7 +216,11 @@ MFSSIZE= 8192 .endif +.if exists(/sbin/bsdlabel) +DISKLABEL?= bsdlabel +.else DISKLABEL?= disklabel +.endif ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - @@ -332,12 +336,12 @@ fi .if defined(EXTLOCALDIR) rm -rf ${CHROOTDIR}/usr/local - cd ${CHROOTDIR}/usr && cp -R ${EXTLOCALDIR} local + cd ${CHROOTDIR}/usr && cp -R -H ${EXTLOCALDIR} local .endif rm -rf ${CHROOTDIR}/usr/src .if defined(EXTSRCDIR) cd ${CHROOTDIR}/usr && \ - cp -R ${EXTSRCDIR} src + cp -R -H ${EXTSRCDIR} src .else cd ${CHROOTDIR}/usr && \ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} @@ -355,7 +359,7 @@ .if !defined(NODOC) rm -rf ${CHROOTDIR}/usr/doc .if defined(EXTDOCDIR) - cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc + cd ${CHROOTDIR}/usr && cp -R -H ${EXTDOCDIR} doc .else cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE} .endif ==== //depot/projects/ia64/release/alpha/dokern.sh#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.70 2003/05/15 01:28:39 obrien Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.72 2003/05/18 03:52:22 scottl Exp $ # # XXX sort by order in GENERIC, not alphabetical @@ -27,6 +27,7 @@ -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ + -e '/ mpt /d' \ -e '/ ch /d' \ -e '/ pass /d' \ -e '/ sa /d' \ @@ -36,15 +37,10 @@ -e '/ ppbus /d' \ -e '/ lpt /d' \ -e '/ ppi /d' \ - -e '/ sf /d' \ - -e '/ sis /d' \ - -e '/ ste /d' \ - -e '/ wb /d' \ -e '/ random /d' \ -e '/ sl /d' \ -e '/ ppp /d' \ -e '/ pty /d' \ - -e '/ gif /d' \ -e '/ faith /d' \ -e '/ uhci /d' \ -e '/ ohci /d' \ @@ -66,5 +62,7 @@ # XXX: blank line above intentional so lines may be added below the last # entry with ease. +echo "options MUTEX_NOINLINE" + echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" ==== //depot/projects/ia64/release/alpha/drivers.conf#13 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.17 2003/05/14 15:38:44 obrien Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.18 2003/05/17 11:58:28 wilko Exp $ # # drv: driver name in kernel config file @@ -52,14 +52,18 @@ ahc ahc 3 disk "Adaptec 2940" ahc ahc_eisa 3 disk "Adaptec 2940 EISA" ahc ahc_pci 3 disk "Adaptec 2940 PCI" +isp isp 3 disk "Qlogic SCSI" amr amr 3 disk "AMI MegaRAID" ispfw ispfw 3 disk "Qlogic SCSI firmware modules" mlx mlx 3 disk "Mylex DAC-family RAID" -mpt mpt 3 disk "LSI-Logic Fusion" +sf if_sf 3 network "Adaptec AIC-6915 (``Starfire'')" +sis if_sis 3 network "SiS 900 / 7016" +ste if_ste 3 network "Sundance ST201 (D-Link DFE-550TX)" +wb if_wb 3 network "Winbond W89C840F" axe if_axe 3 network "ASIX AX88172 USB 2.0 Ethernet" -if_gif if_gif 3 network "IPv6 and IPv4 tunneling" -if_tun if_tun 3 network "Packet tunnel" +gif if_gif 3 network "IPv6 and IPv4 tunneling" +tun if_tun 3 network "Packet tunnel" CD9660 cd9660 3 options "ISO 9660 Filesystem" NFSCLIENT nfsclient 3 options "Network Filesystem Client" ==== //depot/projects/ia64/release/alpha/fixit_crunch.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/alpha/fixit_crunch.conf,v 1.34 2003/04/21 19:14:32 ru Exp $ +# $FreeBSD: src/release/alpha/fixit_crunch.conf,v 1.35 2003/05/17 19:16:28 ru Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -7,9 +7,10 @@ progs ln ls mkdir mv rm rmdir srcdirs /usr/src/sbin -progs clri disklabel dmesg mknod +progs bsdlabel clri dmesg mknod progs mount mount_cd9660 progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore srcdirs /usr/src/usr.bin @@ -19,4 +20,4 @@ progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil ==== //depot/projects/ia64/release/i386/dokern.sh#18 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/i386/dokern.sh,v 1.79 2003/05/05 02:04:55 scottl Exp $ +# $FreeBSD: src/release/i386/dokern.sh,v 1.80 2003/05/18 03:52:22 scottl Exp $ # sed \ @@ -40,6 +40,8 @@ -e '/ uscanner /d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' +echo "options MUTEX_NOINLINE" + echo "options NETGRAPH" echo "options NETGRAPH_ETHER" echo "options NETGRAPH_PPPOE" ==== //depot/projects/ia64/release/i386/fixit_crunch.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.9 2003/04/21 19:14:32 ru Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $ buildopts -DRELEASE_CRUNCH @@ -7,9 +7,10 @@ progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore srcdirs /usr/src/usr.bin @@ -21,4 +22,4 @@ progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil ==== //depot/projects/ia64/release/ia64/doFS.sh#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/ia64/doFS.sh,v 1.7 2003/04/23 09:01:35 ru Exp $ +# $FreeBSD: src/release/ia64/doFS.sh,v 1.8 2003/05/17 19:16:28 ru Exp $ # # See also: ../scripts/doFS.sh # @@ -20,7 +20,7 @@ if [ x$FSLABEL != "xefi" ]; then DOFS_SH=`dirname $0`/../scripts/`basename $0` echo "Transferring control to $DOFS_SH..." - exec sh $DOFS_SH disklabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL + exec sh $DOFS_SH bsdlabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL fi export BLOCKSIZE=512 ==== //depot/projects/ia64/release/pc98/dokern.sh#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/pc98/dokern.sh,v 1.75 2003/04/17 06:04:44 jhay Exp $ +# $FreeBSD: src/release/pc98/dokern.sh,v 1.76 2003/05/18 03:52:22 scottl Exp $ # if [ $# -lt 1 ]; then @@ -114,6 +114,8 @@ fi +echo "options MUTEX_NOINLINE" + echo "options NETGRAPH" echo "options NETGRAPH_ETHER" echo "options NETGRAPH_PPPOE" ==== //depot/projects/ia64/release/pc98/fixit-small_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.2 2003/04/21 19:14:32 ru Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.3 2003/05/17 19:16:28 ru Exp $ buildopts -DRELEASE_CRUNCH @@ -7,9 +7,10 @@ progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore special fdisk srcdir /usr/src/sbin/fdisk_pc98 @@ -22,4 +23,4 @@ progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil ==== //depot/projects/ia64/release/pc98/fixit_crunch.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.9 2003/04/21 19:14:32 ru Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.10 2003/05/17 19:16:28 ru Exp $ buildopts -DRELEASE_CRUNCH @@ -7,9 +7,10 @@ progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore special fdisk srcdir /usr/src/sbin/fdisk_pc98 @@ -23,4 +24,4 @@ progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil ==== //depot/projects/ia64/release/scripts/doFS.sh#17 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.51 2003/05/16 13:59:12 ru Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.52 2003/05/17 19:16:28 ru Exp $ # set -ex @@ -20,7 +20,7 @@ # # We don't have any bootblocks on ia64. Note that -B implies -r, # so we have to specifically specify -r when we don't have -B. -# disklabel fails otherwise. +# bsdlabel fails otherwise. # if [ -f "${RD}/trees/base/boot/boot" ]; then BOOT="-B -b ${RD}/trees/base/boot/boot" ==== //depot/projects/ia64/release/sparc64/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.1 2002/10/13 18:36:06 jake Exp $ +# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.2 2003/05/17 19:16:28 ru Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -30,7 +30,7 @@ if [ "x$1" = "x-b" ]; then dd if=/dev/zero of=${IMG} bs=512 count=1024 MD=`mdconfig -a -t vnode -f ${IMG}` - disklabel -Brw ${MD} auto + sunlabel -Brw ${MD} auto newfs /dev/${MD}c mount /dev/${MD}c ${MNT} mkdir ${MNT}/boot ==== //depot/projects/ia64/sbin/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.120 2003/05/05 21:28:07 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.121 2003/05/17 20:40:42 peter Exp $ # XXX MISSING: icheck ncheck @@ -112,4 +112,8 @@ SUBDIR+=sunlabel .endif +.if ${MACHINE_ARCH} == "amd64" +SUBDIR+=fdisk +.endif + .include ==== //depot/projects/ia64/sbin/bsdlabel/Makefile#5 (text+ko) ==== @@ -1,34 +1,29 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $ + +.PATH: ${.CURDIR}/../../sys/geom PROG= bsdlabel SRCS= bsdlabel.c geom_bsd_enc.c -#MAN+= bsdlabel.5 +#MAN= bsdlabel.5 MAN+= bsdlabel.8 -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS+= bsdlabel.8 disklabel.8 +MLINKS= bsdlabel.8 disklabel.8 .endif -.if ${MACHINE_ARCH} == "alpha" -LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS+= bsdlabel.8 disklabel.8 -.endif +DPADD= ${LIBGEOM} +LDADD= -lgeom -DDADD= ${LIBGEOM} -LDADD= -lgeom -lbsdxml -lsbuf - .if ${MACHINE} == "pc98" -CFLAGS+= -DPC98 +CFLAGS+=-DPC98 .endif -.PATH: ${.CURDIR}/../../sys/geom - .include -test: ${PROG} +test: ${PROG} sh ${.CURDIR}/runtest.sh -testx: ${PROG} +testx: ${PROG} sh -x ${.CURDIR}/runtest.sh ==== //depot/projects/ia64/sbin/devd/devd.8#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.8,v 1.8 2003/04/21 06:26:08 imp Exp $ +.\" $FreeBSD: src/sbin/devd/devd.8,v 1.9 2003/05/17 22:21:27 ru Exp $ .\" .Dd October 17, 2002 .Dt DEVD 8 @@ -47,7 +47,7 @@ .It Fl d Run in the foreground instead of becoming a daemon. .It Fl n -Don't process all pending events before becoming a daemon. +Do not process all pending events before becoming a daemon. Instaed, call daemon right away. .El .Sh IMPLEMENTATION NOTES ==== //depot/projects/ia64/sbin/gbde/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/gbde/Makefile,v 1.9 2003/04/16 11:54:11 ru Exp $ +# $FreeBSD: src/sbin/gbde/Makefile,v 1.10 2003/05/17 19:05:17 ru Exp $ PROG= gbde SRCS= gbde.c template.c @@ -23,8 +23,8 @@ CLEANFILES+= template.c MAN= gbde.8 -DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lmd -lutil -lgeom -lbsdxml -lsbuf +DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} +LDADD= -lmd -lutil -lgeom template.c: template.txt file2c 'const char template[] = {' ',0};' \ ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.16 2003/05/05 23:41:17 dougb Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.17 2003/05/17 22:31:48 ru Exp $ .\" .Dd August 5, 2001 .Dt MDMFS 8 @@ -291,6 +291,7 @@ .Pp The same file system created as an entry in .Pa /etc/fstab : +.Pp .Dl "md /tmp mfs rw,-s32m 2 0" .Pp Create and mount a 16 megabyte malloc-backed file system on ==== //depot/projects/ia64/sbin/mount/mount.8#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.58 2003/04/07 22:58:34 mdodd Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.59 2003/05/17 22:35:35 ru Exp $ .\" .Dd April 7, 2003 .Dt MOUNT 8 @@ -412,17 +412,17 @@ (kernel compile-time), or dynamic basis (loaded as a kernel module by .Xr kldload 8 ) . .Sh ENVIRONMENT -.Bl -tag -width PATH_FSTAB -.It Pa PATH_FSTAB +.Bl -tag -width ".Ev PATH_FSTAB" +.It Ev PATH_FSTAB If the environment variable -.Pa PATH_FSTAB -is set all operations are performed against the specified file. -.Pa PATH_FSTAB +.Ev PATH_FSTAB +is set, all operations are performed against the specified file. +.Ev PATH_FSTAB will not be honored if the process environment or memory address space is considred .Dq tainted . (See -.Fn issetugid +.Xr issetugid 2 for more information.) .El .Sh FILES ==== //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#9 (text+ko) ==== @@ -30,15 +30,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 +.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.39 2003/05/17 22:53:44 ru Exp $ .\" -.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.38 2003/05/11 00:38:58 trhodes Exp $ -.\"" -.Dd March 29, 1995 +.Dd May 11, 2003 .Dt MOUNT_NFS 8 .Os .Sh NAME .Nm mount_nfs -.Nd mount nfs file systems +.Nd mount NFS file systems .Sh SYNOPSIS .Nm .Op Fl 23NPTUbcdiLls @@ -58,7 +57,7 @@ .Nm utility calls the .Xr mount 2 -system call to prepare and graft a remote nfs file system +system call to prepare and graft a remote NFS file system .Pq Ar rhost : Ns Ar path on to the file system tree at the point .Ar node . @@ -94,8 +93,8 @@ .Bl -tag -width indent .It Fl 2 Use the NFS Version 2 protocol (the default is to try version 3 first -then version 2). Note that NFS version 2 has a file size limit of 2 -gigabytes. +then version 2). +Note that NFS version 2 has a file size limit of 2 gigabytes. .It Fl 3 Use the NFS Version 3 protocol. .It Fl D @@ -107,7 +106,9 @@ .It Fl I Set the readdir read size to the specified value. The value should normally -be a multiple of DIRBLKSIZ that is <= the read size for the mount. +be a multiple of +.Dv DIRBLKSIZ +that is <= the read size for the mount. .It Fl L Do .Em not @@ -115,10 +116,10 @@ .Xr fcntl 2 locks over the wire. All locks will be local and not seen by the server -and likewise not seen by other NFS clients. This removes -the need to run the +and likewise not seen by other NFS clients. +This removes the need to run the .Xr rpcbind 8 -service and the +service and the .Xr rpc.statd 8 and .Xr rpc.lockd 8 @@ -208,68 +209,75 @@ See the .Xr mount 8 man page for possible options and their meanings. -The following NFS specific option is also available: +The following NFS specific options are also available: .Bl -tag -width indent -.It port= +.It Cm port Ns = Ns Aq Ar port_number Use specified port number for NFS requests. The default is to query the portmapper for the NFS port. -.It acregmin= -.It acregmax= -.It acdirmin= -.It acdirmax= +.It Cm acregmin Ns = Ns Aq Ar seconds +.It Cm acregmax Ns = Ns Aq Ar seconds +.It Cm acdirmin Ns = Ns Aq Ar seconds +.It Cm acdirmax Ns = Ns Aq Ar seconds When attributes of files are cached, a timeout calculated to determine -whether a given cache entry has expired. These four values determine the -upper and lower bounds of the timeouts for ``directory'' attributes and -``regular'' (ie: everything else). The default values are 3 -> 60 seconds -for regular files, and 30 -> 60 seconds for directories. The algorithm to -calculate the timeout is based on the age of the file. The older the file, +whether a given cache entry has expired. +These four values determine the upper and lower bounds of the timeouts for +.Dq directory +attributes and +.Dq regular +(ie: everything else). +The default values are 3 -> 60 seconds +for regular files, and 30 -> 60 seconds for directories. +The algorithm to calculate the timeout is based on the age of the file. +The older the file, the longer the cache is considered valid, subject to the limits above. -.It noinet4 -.It noinet6 -Disables AF_INET or AF_INET6 connections. Useful for hosts that have +.It Cm noinet4 , noinet6 +Disables +.Dv AF_INET +or +.Dv AF_INET6 +connections. +Useful for hosts that have both an A record and an AAAA record for the same name. .El -.Pp -.Bl -tag -width "dumbtimerXX" -\fBHistoric \&-o options\fR -.Pp +.Bl -tag -width ".Cm dumbtimer" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 19 14:25:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C4EB37B409; Mon, 19 May 2003 14:25: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 A156237B407 for ; Mon, 19 May 2003 14:25:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0357843F85 for ; Mon, 19 May 2003 14:25:27 -0700 (PDT) (envelope-from obrien@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 h4JLPQ0U035873 for ; Mon, 19 May 2003 14:25:26 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLPQlP035870 for perforce@freebsd.org; Mon, 19 May 2003 14:25:26 -0700 (PDT) Date: Mon, 19 May 2003 14:25:26 -0700 (PDT) Message-Id: <200305192125.h4JLPQlP035870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31477 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, 19 May 2003 21:25:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=31477 Change 31477 by obrien@obrien_trang on 2003/05/19 14:24:41 Build fdisk. Affected files ... .. //depot/projects/hammer/sbin/Makefile#5 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#5 (text+ko) ==== @@ -5,7 +5,6 @@ SUBDIR= adjkerntz \ atacontrol \ - atm \ badsect \ bsdlabel \ camcontrol \ @@ -102,6 +101,11 @@ .endif .endif +# XXX: should combine with i386 above +.if ${MACHINE_ARCH} == "i386" +SUBDIR+=fdisk +.endif + .if ${MACHINE_ARCH} == "ia64" SUBDIR+=fdisk \ gpt \ From owner-p4-projects@FreeBSD.ORG Mon May 19 14:26:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E1D537B404; Mon, 19 May 2003 14:26: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 552E037B401 for ; Mon, 19 May 2003 14:26:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEF8143FBD for ; Mon, 19 May 2003 14:26:28 -0700 (PDT) (envelope-from obrien@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 h4JLQS0U035904 for ; Mon, 19 May 2003 14:26:28 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLQS6v035901 for perforce@freebsd.org; Mon, 19 May 2003 14:26:28 -0700 (PDT) Date: Mon, 19 May 2003 14:26:28 -0700 (PDT) Message-Id: <200305192126.h4JLQS6v035901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31478 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, 19 May 2003 21:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=31478 Change 31478 by obrien@obrien_trang on 2003/05/19 14:25:47 Build & install sunlabel on all arches. Affected files ... .. //depot/projects/hammer/sbin/Makefile#6 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#6 (text+ko) ==== @@ -72,6 +72,7 @@ slattach \ spppcontrol \ startslip \ + sunlabel \ swapon \ sysctl \ tunefs \ @@ -112,8 +113,4 @@ mca .endif -.if ${MACHINE_ARCH} == "sparc64" -SUBDIR+=sunlabel -.endif - .include From owner-p4-projects@FreeBSD.ORG Mon May 19 14:43:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26EF137B404; Mon, 19 May 2003 14:43:52 -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 B745F37B401 for ; Mon, 19 May 2003 14:43:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62E3A43F3F for ; Mon, 19 May 2003 14:43:51 -0700 (PDT) (envelope-from obrien@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 h4JLhp0U036718 for ; Mon, 19 May 2003 14:43:51 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLhoA3036714 for perforce@freebsd.org; Mon, 19 May 2003 14:43:50 -0700 (PDT) Date: Mon, 19 May 2003 14:43:50 -0700 (PDT) Message-Id: <200305192143.h4JLhoA3036714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31480 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, 19 May 2003 21:43:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=31480 Change 31480 by obrien@obrien_trang on 2003/05/19 14:42:52 bsdlable is the disklabel de'jour on Hammer. Affected files ... .. //depot/projects/hammer/sbin/bsdlabel/Makefile#5 edit Differences ... ==== //depot/projects/hammer/sbin/bsdlabel/Makefile#5 (text+ko) ==== @@ -6,12 +6,7 @@ #MAN+= bsdlabel.5 MAN+= bsdlabel.8 -.if ${MACHINE_ARCH} == "i386" -LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS+= bsdlabel.8 disklabel.8 -.endif - -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS+= bsdlabel.8 disklabel.8 .endif From owner-p4-projects@FreeBSD.ORG Mon May 19 14:46:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3201337B404; Mon, 19 May 2003 14:46:58 -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 D271537B401 for ; Mon, 19 May 2003 14:46:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9613D43FAF for ; Mon, 19 May 2003 14:46:56 -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 h4JLku0U036886 for ; Mon, 19 May 2003 14:46:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLkt8m036883 for perforce@freebsd.org; Mon, 19 May 2003 14:46:55 -0700 (PDT) Date: Mon, 19 May 2003 14:46:55 -0700 (PDT) Message-Id: <200305192146.h4JLkt8m036883@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 31481 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, 19 May 2003 21:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=31481 Change 31481 by peter@peter_daintree on 2003/05/19 14:46:30 IFC @31479 Affected files ... .. //depot/projects/hammer/Makefile.inc1#16 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#3 integrate .. //depot/projects/hammer/bin/ed/Makefile#2 integrate .. //depot/projects/hammer/bin/pwd/pwd.1#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#8 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#5 integrate .. //depot/projects/hammer/games/caesar/caesar.6#3 integrate .. //depot/projects/hammer/games/factor/Makefile#3 integrate .. //depot/projects/hammer/games/grdc/grdc.6#4 integrate .. //depot/projects/hammer/lib/Makefile#13 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#4 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/brk.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/pipe.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/sbrk.S#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#2 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#7 integrate .. //depot/projects/hammer/lib/libgeom/Makefile#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_ia64.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/modules.inc#8 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.h#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#4 integrate .. //depot/projects/hammer/libexec/Makefile#15 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/hammer/release/Makefile#18 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#8 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#9 integrate .. //depot/projects/hammer/release/alpha/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate .. //depot/projects/hammer/release/i386/dokern.sh#12 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/ia64/doFS.sh#4 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#9 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#10 integrate .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/hammer/sbin/Makefile#7 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#6 integrate .. //depot/projects/hammer/sbin/devd/devd.8#6 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.8#7 integrate .. //depot/projects/hammer/sbin/gbde/Makefile#6 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#7 integrate .. //depot/projects/hammer/sbin/mount/mount.8#5 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#6 integrate .. //depot/projects/hammer/sbin/raidctl/raidctl.8#3 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#6 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/hammer/sbin/umount/umount.8#4 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#5 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#10 integrate .. //depot/projects/hammer/share/man/man4/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#6 integrate .. //depot/projects/hammer/share/man/man4/ehci.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/hammer/share/man/man4/my.4#1 branch .. //depot/projects/hammer/share/man/man5/make.conf.5#8 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/hammer/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/hammer/share/man/man9/byteorder.9#3 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#5 integrate .. //depot/projects/hammer/share/man/man9/signal.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.README#4 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#9 integrate .. //depot/projects/hammer/sys/alpha/include/_limits.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#38 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#3 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#4 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#5 integrate .. //depot/projects/hammer/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/hammer/sys/conf/files.ia64#9 integrate .. //depot/projects/hammer/sys/conf/options#15 integrate .. //depot/projects/hammer/sys/conf/options.ia64#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/i386/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/i386/include/limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_util.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.s#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.s#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.s#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/swtch.s#4 delete .. //depot/projects/hammer/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/asm.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/frame.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/pcb.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/proc.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/reg.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/rse.h#2 delete .. //depot/projects/hammer/sys/ia64/include/signal.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/smp.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/unwind.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#25 integrate .. //depot/projects/hammer/sys/powerpc/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/limits.h#4 integrate .. //depot/projects/hammer/sys/sys/ata.h#5 integrate .. //depot/projects/hammer/sys/sys/limits.h#5 integrate .. //depot/projects/hammer/sys/sys/mutex.h#4 integrate .. //depot/projects/hammer/sys/sys/proc.h#23 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#20 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/hammer/tools/make_libdeps.sh#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#14 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pppd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#9 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.357 2003/05/15 17:59:32 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -8,7 +8,6 @@ # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNOSECURE do not go into secure subdir # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -70,7 +69,7 @@ .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) SUBDIR+= secure .endif .if exists(${.CURDIR}/share) && !defined(NOSHARE) @@ -284,6 +283,8 @@ usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${WORLDTMP}/usr/include ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -789,7 +790,8 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libpam lib/libradius \ lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ @@ -800,7 +802,7 @@ _generic_libs+= lib -.if !defined(NOCRYPT) && !defined(NOSECURE) +.if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl .if !defined(NO_OPENSSH) ==== //depot/projects/hammer/bin/chflags/chflags.1#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.17 2003/05/16 21:18:01 ru Exp $ .\" -.Dd Mar 24, 2003 +.Dd March 24, 2003 .Dt CHFLAGS 1 .Os .Sh NAME ==== //depot/projects/hammer/bin/ed/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.21 2001/12/06 10:50:23 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des 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}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCIPHER} ==== //depot/projects/hammer/bin/pwd/pwd.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.21 2003/04/12 03:22:54 tjr Exp $ +.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.22 2003/05/16 21:19:32 ru Exp $ .\" .Dd April 12, 2003 .Dt PWD 1 @@ -43,7 +43,7 @@ .Nd return working directory name .Sh SYNOPSIS .Nm -.Oo Fl L | Fl P Oc +.Op Fl L | P .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/bin/sh/sh.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.87 2003/05/16 21:19:32 ru Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -1295,7 +1295,7 @@ List or alter key bindings for the line editor. This command is documented in .Xr editrc 5 . -.It Ic cd Oo Fl L | Fl P Oc Op Ar directory +.It Ic cd Oo Fl L | P Oc Op Ar directory Switch to the specified .Ar directory , or to the directory specified in the @@ -1626,7 +1626,7 @@ If the .Fl s option is specified, only the PIDs of the jobs are printed, one per line. -.It Ic pwd Oo Fl L | Fl P Oc +.It Ic pwd Op Fl L | P Print the path of the current directory. The built-in command may differ from the program of the same name because the built-in command remembers what the current directory ==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#4 (text+ko) ==== @@ -3959,15 +3959,16 @@ . ti -\n[doc-reg-dtl]u . . nh -. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\ -. doc-item-box\n[doc-list-depth] +. doc-item-box\n[doc-list-depth] +. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ . br -. \} . el \{\ -. chop doc-item-box\n[doc-list-depth] -. \" Using \Z prevents stretching of the spaces in the tag -. nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c -. nop \h'\n[doc-reg-dtl]u'\c +. \" format the tag separately to prevent stretching of spaces +. vpt 0 +. br +. sp -1 +. vpt 1 +. nop \&\c . nr doc-have-space 1 . \} . ==== //depot/projects/hammer/etc/rc.d/Makefile#8 (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.15 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.16 2003/05/18 03:34:24 mtm Exp $ .include @@ -7,7 +7,7 @@ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ - ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref \ + ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localdaemons lomac lpd motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \ network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ==== //depot/projects/hammer/etc/rc.d/ldconfig#5 (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.5 2003/04/30 07:12:09 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $ # # PROVIDE: ldconfig @@ -20,8 +20,9 @@ { case ${OSTYPE} in FreeBSD) + _ins= ldconfig=${ldconfig_command} - checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i" + checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then _LDC=/usr/lib for i in ${ldconfig_paths}; do @@ -30,7 +31,7 @@ fi done echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} + ${ldconfig} -elf ${_ins} ${_LDC} # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in @@ -44,7 +45,7 @@ fi done echo 'a.out ldconfig path:' ${_LDC} - ${ldconfig} -aout ${_LDC} + ${ldconfig} -aout ${_ins} ${_LDC} ;; esac fi ==== //depot/projects/hammer/games/caesar/caesar.6#3 (text+ko) ==== @@ -30,13 +30,13 @@ .\" SUCH DAMAGE. .\" .\" @(#)caesar.6 8.2 (Berkeley) 11/16/93 -.\" $FreeBSD: src/games/caesar/caesar.6,v 1.8 2003/03/24 11:18:30 tjr Exp $ +.\" $FreeBSD: src/games/caesar/caesar.6,v 1.9 2003/05/16 21:26:39 ru Exp $ .\" .Dd November 16, 1993 .Dt CAESAR 6 .Os .Sh NAME -.Nm caesar +.Nm caesar , rot13 .Nd decrypt caesar ciphers .Sh SYNOPSIS .Nm ==== //depot/projects/hammer/games/factor/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.5 2002/10/09 19:55:04 fanf Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} ==== //depot/projects/hammer/games/grdc/grdc.6#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/games/grdc/grdc.6,v 1.5 2003/03/28 16:37:45 mux Exp $ +.\" $FreeBSD: src/games/grdc/grdc.6,v 1.6 2003/05/16 21:27:23 ru Exp $ .Dd September 25, 2001 .Dt GRDC 6 .Os @@ -7,8 +7,7 @@ .Nd grand digital clock (curses) .Sh SYNOPSIS .Nm -.Op Fl s -.Op Fl t +.Op Fl st .Op Ar n .Sh DESCRIPTION .Nm ==== //depot/projects/hammer/lib/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.156 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,13 +79,11 @@ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) _libtelnet= libtelnet .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif ==== //depot/projects/hammer/lib/libc/gen/dlinfo.3#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/lib/libc/gen/dlinfo.3,v 1.4 2003/03/24 16:07:19 charnier Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $ .\" .Dd February 14, 2003 .Os @@ -195,7 +195,7 @@ dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); while (map != NULL) { - printf("%p: %s\n", map->l_addr, map->l_name); + printf("%p: %s\\n", map->l_addr, map->l_name); map = map->l_next; } .Ed @@ -227,7 +227,7 @@ path = &info->dls_serpath[0]; for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { - (void) printf("%2d: %s\n", cnt, path->dls_name); + (void) printf("%2d: %s\\n", cnt, path->dls_name); } .Ed .Sh RETURN VALUES ==== //depot/projects/hammer/lib/libc/gen/getfsent.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.12 2003/04/07 22:59:12 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $ .\" .Dd April 7, 2003 .Dt GETFSENT 3 @@ -182,7 +182,7 @@ and .Fn getfstab functions appeared in -.Fx 5.1. +.Fx 5.1 . .Sh BUGS These functions use static data storage; if the data is needed for future use, it should be ==== //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $ .\" .Dd July 27, 1998 .Os @@ -110,7 +110,7 @@ .Pp .Fa state will contain the state of the VME flag on return. -\" .It Dv VM86_SET_VME +.\" .It Dv VM86_SET_VME .El .Pp vm86 mode is entered by calling ==== //depot/projects/hammer/lib/libc/ia64/sys/brk.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.3 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" @@ -44,12 +44,14 @@ add r14=@ltoff(minbrk),gp ;; ld8 r14=[r14] ;; ld8 r14=[r14] ;; - cmp.ltu p6,p0=in0,r14 ;; -(p6) mov in0=r14 + cmp.ltu p6,p0=r32,r14 ;; +(p6) mov r32=r14 ;; + st8 [sp]=r32 CALLSYS_ERROR(break) + ld8 r15=[sp] add r14=@ltoff(curbrk),gp ;; ld8 r14=[r14] ;; - st8 [r14]=in0 + st8 [r14]=r15 mov ret0=0 br.ret.sptk.few rp END(brk) ==== //depot/projects/hammer/lib/libc/ia64/sys/pipe.S#3 (text+ko) ==== @@ -28,14 +28,20 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.3 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" -SYSCALL(pipe) - .regstk 1,0,0,0 - st4 [in0]=ret0,4 ;; - st4 [in0]=ret1 - mov ret0=0 +ENTRY(__sys_pipe, 1) + WEAK_ALIAS(pipe, __sys_pipe) + WEAK_ALIAS(_pipe, __sys_pipe) + st8 [sp]=r32 + CALLSYS_ERROR(pipe) + ld8 r14=[sp] + ;; + st4 [r14]=ret0,4 + ;; + st4 [r14]=ret1 + mov ret0=0 br.ret.sptk.few rp -END(pipe) +END(__sys_pipe) ==== //depot/projects/hammer/lib/libc/ia64/sys/sbrk.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.4 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.5 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" @@ -43,18 +43,21 @@ add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] - cmp.eq p6, p0 = in0, r0 + cmp.eq p6, p0 = r32, r0 ;; ld8 ret0 = [r14] (p6) br.ret.sptk.few rp ;; - add in0 = ret0, in0 + add r32 = ret0, r32 + ;; + st8 [sp] = r32 CALLSYS_ERROR(break) + ld8 r15 = [sp] add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] ;; ld8 ret0 = [r14] - st8 [r14] = in0 + st8 [r14] = r15 br.ret.sptk.few rp END(sbrk) ==== //depot/projects/hammer/lib/libc/net/nsdispatch.3#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.9 2003/04/17 14:14:22 nectar Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -238,7 +238,8 @@ "nsswitch.conf\*(lp4\*(rp" manual pages. The -.Fx Project +.Fx +Project added the support for threads and NSS modules, and normalized the uses of .Fn nsdispatch ==== //depot/projects/hammer/lib/libc/rpc/svc_generic.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.4 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.5 2003/05/18 15:07:25 mbr Exp $"); /* * svc_generic.c, Server side for RPC. @@ -245,7 +245,7 @@ _listen(fd, SOMAXCONN); } else { if (_bind(fd, - (struct sockaddr *)(void *)&bindaddr->addr.buf, + (struct sockaddr *)bindaddr->addr.buf, (socklen_t)si.si_alen) < 0) { warnx( "svc_tli_create: could not bind to requested address"); ==== //depot/projects/hammer/lib/libcrypt/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libcrypt/Makefile,v 1.30 2001/03/27 17:26:59 ru Exp $ +# $FreeBSD: src/lib/libcrypt/Makefile,v 1.31 2003/05/19 15:51:59 des Exp $ # SHLIB_MAJOR= 2 @@ -13,7 +13,7 @@ CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH ==== //depot/projects/hammer/lib/libfetch/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.40 2003/05/01 14:39:43 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $ LIB= fetch CFLAGS+= -I. @@ -9,7 +9,7 @@ MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto ==== //depot/projects/hammer/lib/libgeom/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.5 2003/03/23 10:15:02 phk Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $ LIB= geom SRCS+= geom_getxml.c @@ -11,6 +11,9 @@ WARNS?= 3 +DPADD= ${LIBBSDXML} ${LIBSBUF} +LDADD= -lbsdxml -lsbuf + MAN= libgeom.3 MLINKS+= \ ==== //depot/projects/hammer/lib/libkvm/kvm_ia64.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.3 2002/10/21 04:21:12 marcel Exp $ */ +/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.4 2003/05/16 21:26:40 marcel Exp $ */ /* $NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $ */ /* @@ -148,7 +148,7 @@ * addresses/values. */ - nlist[0].n_name = "kptdir"; + nlist[0].n_name = "ia64_kptdir"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { ==== //depot/projects/hammer/lib/libpam/modules/modules.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.16 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.17 2003/05/19 15:51:59 des Exp $ MODULES = MODULES += pam_chroot @@ -24,8 +24,7 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) MODULES += pam_ssh .endif MODULES += pam_tacplus ==== //depot/projects/hammer/lib/libpthread/sys/lock.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/lib/libpthread/sys/lock.c,v 1.3 2003/05/04 22:29:09 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.4 2003/05/16 19:58:29 deischen Exp $ */ #include @@ -65,7 +65,7 @@ lck->l_head->lr_watcher = NULL; lck->l_head->lr_owner = NULL; lck->l_head->lr_waiting = 0; - lck->l_head->lr_handshake = 0; + lck->l_head->lr_active = 1; lck->l_tail = lck->l_head; } return (0); @@ -85,7 +85,7 @@ lu->lu_myreq->lr_watcher = NULL; lu->lu_myreq->lr_owner = lu; lu->lu_myreq->lr_waiting = 0; - lu->lu_myreq->lr_handshake = 0; + lu->lu_myreq->lr_active = 0; lu->lu_watchreq = NULL; lu->lu_priority = 0; lu->lu_private = priv; @@ -166,19 +166,16 @@ for (i = 0; i < MAX_SPINS; i++) { if (lu->lu_watchreq->lr_locked == 0) return; + if (lu->lu_watchreq->lr_active == 0) + break; } atomic_store_rel_long(&lu->lu_watchreq->lr_waiting, 1); while (lu->lu_watchreq->lr_locked != 0) lck->l_wait(lck, lu); atomic_store_rel_long(&lu->lu_watchreq->lr_waiting, 0); - /* - * Wait for original owner to stop accessing the - * lockreq object. - */ - while (lu->lu_watchreq->lr_handshake) - ; } } + lu->lu_myreq->lr_active = 1; } /* @@ -240,24 +237,21 @@ } } if (lu_h != NULL) { - lu_h->lu_watchreq->lr_handshake = 1; /* Give the lock to the highest priority user. */ - atomic_store_rel_long(&lu_h->lu_watchreq->lr_locked, 0); if ((lu_h->lu_watchreq->lr_waiting != 0) && (lck->l_wakeup != NULL)) /* Notify the sleeper */ lck->l_wakeup(lck, lu_h->lu_myreq->lr_watcher); - atomic_store_rel_long(&lu_h->lu_watchreq->lr_handshake, - 0); + else + atomic_store_rel_long(&lu_h->lu_watchreq->lr_locked, 0); } else { - myreq->lr_handshake = 1; - /* Give the lock to the previous request. */ - atomic_store_rel_long(&myreq->lr_locked, 0); if ((myreq->lr_waiting != 0) && (lck->l_wakeup != NULL)) /* Notify the sleeper */ lck->l_wakeup(lck, myreq->lr_watcher); - atomic_store_rel_long(&myreq->lr_handshake, 0); + else + /* Give the lock to the previous request. */ + atomic_store_rel_long(&myreq->lr_locked, 0); } } else { /* @@ -270,19 +264,25 @@ lu->lu_watchreq = NULL; lu->lu_myreq->lr_locked = 1; lu->lu_myreq->lr_waiting = 0; - if (lck->l_wakeup) { - /* Start wakeup */ - myreq->lr_handshake = 1; + if (myreq->lr_waiting != 0 && lck->l_wakeup) + /* Notify the sleeper */ + lck->l_wakeup(lck, myreq->lr_watcher); + else /* Give the lock to the previous request. */ atomic_store_rel_long(&myreq->lr_locked, 0); - if (myreq->lr_waiting != 0) { - /* Notify the sleeper */ - lck->l_wakeup(lck, myreq->lr_watcher); - } - /* Stop wakeup */ - atomic_store_rel_long(&myreq->lr_handshake, 0); - } else { - atomic_store_rel_long(&myreq->lr_locked, 0); - } } + lu->lu_myreq->lr_active = 0; +} + +void +_lock_grant(struct lock *lck /* unused */, struct lockuser *lu) +{ + atomic_store_rel_long(&lu->lu_watchreq->lr_locked, 0); } + +void +_lockuser_setactive(struct lockuser *lu, int active) +{ + lu->lu_myreq->lr_active = active; +} + ==== //depot/projects/hammer/lib/libpthread/sys/lock.h#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/lib/libpthread/sys/lock.h,v 1.3 2003/05/04 22:29:09 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/lock.h,v 1.4 2003/05/16 19:58:29 deischen Exp $ */ #ifndef _LOCK_H_ @@ -55,7 +55,7 @@ struct lockuser *lr_watcher; /* only used for priority locks */ struct lockuser *lr_owner; /* only used for priority locks */ long lr_waiting; /* non-zero when wakeup needed */ - volatile long lr_handshake; /* non-zero when wakeup in progress */ + volatile int lr_active; /* non-zero if the lock is last lock for thread */ }; struct lockuser { @@ -72,6 +72,7 @@ #define _LCK_REQUEST_INITIALIZER { 0, NULL, NULL, 0 } #define _LCK_BUSY(lu) ((lu)->lu_watchreq->lr_locked != 0) +#define _LCK_ACTIVE(lu) ((lu)->lu_watchreq->lr_active != 0) #define _LCK_GRANTED(lu) ((lu)->lu_watchreq->lr_locked == 0) #define _LCK_SET_PRIVATE(lu, p) (lu)->lu_private = (void *)(p) @@ -84,7 +85,9 @@ lock_handler_t *, lock_handler_t *); int _lockuser_init(struct lockuser *lu, void *priv); void _lockuser_destroy(struct lockuser *lu); +void _lockuser_setactive(struct lockuser *lu, int active); void _lock_acquire(struct lock *, struct lockuser *, int); void _lock_release(struct lock *, struct lockuser *); +void _lock_grant(struct lock *, struct lockuser *); #endif ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.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/libpthread/thread/thr_cond.c,v 1.39 2003/05/02 11:39:00 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.40 2003/05/16 19:58:29 deischen Exp $ */ #include #include @@ -267,11 +267,12 @@ * lock); we should be able to safely * set the state. */ - THR_LOCK_SWITCH(curthread); + THR_SCHED_LOCK(curthread, curthread); THR_SET_STATE(curthread, PS_COND_WAIT); /* Remember the CV: */ curthread->data.cond = *cond; + THR_SCHED_UNLOCK(curthread, curthread); /* Unlock the CV structure: */ THR_LOCK_RELEASE(curthread, @@ -281,7 +282,6 @@ _thr_sched_switch(curthread); curthread->data.cond = NULL; - THR_UNLOCK_SWITCH(curthread); /* * XXX - This really isn't a good check @@ -479,11 +479,12 @@ * lock); we should be able to safely * set the state. */ - THR_LOCK_SWITCH(curthread); + THR_SCHED_LOCK(curthread, curthread); THR_SET_STATE(curthread, PS_COND_WAIT); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 19 14:56:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508A637B404; Mon, 19 May 2003 14:56:09 -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 DCB4537B401 for ; Mon, 19 May 2003 14:56:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 748D343F3F for ; Mon, 19 May 2003 14:56:08 -0700 (PDT) (envelope-from obrien@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 h4JLu80U037306 for ; Mon, 19 May 2003 14:56:08 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLu7wu037303 for perforce@freebsd.org; Mon, 19 May 2003 14:56:07 -0700 (PDT) Date: Mon, 19 May 2003 14:56:07 -0700 (PDT) Message-Id: <200305192156.h4JLu7wu037303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31482 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, 19 May 2003 21:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=31482 Change 31482 by obrien@obrien_trang on 2003/05/19 14:55:43 Localism (no atm) accidently committed in change-set 31477. Affected files ... .. //depot/projects/hammer/sbin/Makefile#8 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#8 (text+ko) ==== @@ -5,6 +5,7 @@ SUBDIR= adjkerntz \ atacontrol \ + atm \ badsect \ bsdlabel \ camcontrol \ From owner-p4-projects@FreeBSD.ORG Mon May 19 14:58:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7637037B404; Mon, 19 May 2003 14:58:12 -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 1063237B401 for ; Mon, 19 May 2003 14:58:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD45243F93 for ; Mon, 19 May 2003 14:58:11 -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 h4JLwB0U037407 for ; Mon, 19 May 2003 14:58:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLwBjg037404 for perforce@freebsd.org; Mon, 19 May 2003 14:58:11 -0700 (PDT) Date: Mon, 19 May 2003 14:58:11 -0700 (PDT) Message-Id: <200305192158.h4JLwBjg037404@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 31483 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, 19 May 2003 21:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=31483 Change 31483 by peter@peter_daintree on 2003/05/19 14:57:53 I dont know what the hell happened last time, but try and repair the damage. Affected files ... .. //depot/projects/hammer/sbin/bsdlabel/Makefile#7 integrate Differences ... ==== //depot/projects/hammer/sbin/bsdlabel/Makefile#7 (text+ko) ==== @@ -1,29 +1,29 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $ + +.PATH: ${.CURDIR}/../../sys/geom PROG= bsdlabel SRCS= bsdlabel.c geom_bsd_enc.c -#MAN+= bsdlabel.5 +#MAN= bsdlabel.5 MAN+= bsdlabel.8 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS+= bsdlabel.8 disklabel.8 +MLINKS= bsdlabel.8 disklabel.8 .endif -DDADD= ${LIBGEOM} -LDADD= -lgeom -lbsdxml -lsbuf +DPADD= ${LIBGEOM} +LDADD= -lgeom .if ${MACHINE} == "pc98" -CFLAGS+= -DPC98 +CFLAGS+=-DPC98 .endif -.PATH: ${.CURDIR}/../../sys/geom - .include -test: ${PROG} +test: ${PROG} sh ${.CURDIR}/runtest.sh -testx: ${PROG} +testx: ${PROG} sh -x ${.CURDIR}/runtest.sh From owner-p4-projects@FreeBSD.ORG Mon May 19 15:01:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AED437B404; Mon, 19 May 2003 15:01:17 -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 D66F037B401 for ; Mon, 19 May 2003 15:01:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D26543F75 for ; Mon, 19 May 2003 15:01:16 -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 h4JM1G0U037640 for ; Mon, 19 May 2003 15:01:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JM1F2f037637 for perforce@freebsd.org; Mon, 19 May 2003 15:01:15 -0700 (PDT) Date: Mon, 19 May 2003 15:01:15 -0700 (PDT) Message-Id: <200305192201.h4JM1F2f037637@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 31484 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, 19 May 2003 22:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=31484 Change 31484 by peter@peter_daintree on 2003/05/19 15:01:13 I dont know what david was thinking, but fdisk is already included in the i386 case above. Affected files ... .. //depot/projects/hammer/sbin/Makefile#9 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#9 (text+ko) ==== @@ -103,11 +103,6 @@ .endif .endif -# XXX: should combine with i386 above -.if ${MACHINE_ARCH} == "i386" -SUBDIR+=fdisk -.endif - .if ${MACHINE_ARCH} == "ia64" SUBDIR+=fdisk \ gpt \ From owner-p4-projects@FreeBSD.ORG Mon May 19 15:06:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FD4237B404; Mon, 19 May 2003 15:06: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 D95B337B401 for ; Mon, 19 May 2003 15:06:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 700F243F93 for ; Mon, 19 May 2003 15:06:23 -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 h4JM6N0U038824 for ; Mon, 19 May 2003 15:06:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JM6Mup038821 for perforce@freebsd.org; Mon, 19 May 2003 15:06:22 -0700 (PDT) Date: Mon, 19 May 2003 15:06:22 -0700 (PDT) Message-Id: <200305192206.h4JM6Mup038821@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 31485 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, 19 May 2003 22:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=31485 Change 31485 by peter@peter_daintree on 2003/05/19 15:05:24 I accidently clobbered Makefile#6 in the last IFC Affected files ... .. //depot/projects/hammer/sbin/Makefile#10 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#10 (text+ko) ==== @@ -109,10 +109,6 @@ mca .endif -.if ${MACHINE_ARCH} == "sparc64" -SUBDIR+=sunlabel -.endif - .if ${MACHINE_ARCH} == "amd64" SUBDIR+=fdisk .endif From owner-p4-projects@FreeBSD.ORG Mon May 19 15:20:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C29BE37B404; Mon, 19 May 2003 15:20:42 -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 71BC037B401 for ; Mon, 19 May 2003 15:20:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08AA943F93 for ; Mon, 19 May 2003 15:20:42 -0700 (PDT) (envelope-from obrien@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 h4JMKf0U039613 for ; Mon, 19 May 2003 15:20:41 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JMKf16039610 for perforce@freebsd.org; Mon, 19 May 2003 15:20:41 -0700 (PDT) Date: Mon, 19 May 2003 15:20:41 -0700 (PDT) Message-Id: <200305192220.h4JMKf16039610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31487 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, 19 May 2003 22:20:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=31487 Change 31487 by obrien@obrien_trang on 2003/05/19 15:20:19 restore XXX comment -- I guess things hadn't been synced with -CURRENT in a while. Affected files ... .. //depot/projects/hammer/sbin/Makefile#11 edit Differences ... ==== //depot/projects/hammer/sbin/Makefile#11 (text+ko) ==== @@ -109,6 +109,7 @@ mca .endif +# XXX: should combine with i386 above .if ${MACHINE_ARCH} == "amd64" SUBDIR+=fdisk .endif From owner-p4-projects@FreeBSD.ORG Mon May 19 15:25:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F53A37B404; Mon, 19 May 2003 15:25: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 A1A6537B401 for ; Mon, 19 May 2003 15:25:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C65143F85 for ; Mon, 19 May 2003 15:25:50 -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 h4JMPo0U039857 for ; Mon, 19 May 2003 15:25:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JMPnKB039854 for perforce@freebsd.org; Mon, 19 May 2003 15:25:49 -0700 (PDT) Date: Mon, 19 May 2003 15:25:49 -0700 (PDT) Message-Id: <200305192225.h4JMPnKB039854@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 31490 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, 19 May 2003 22:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=31490 Change 31490 by peter@peter_daintree on 2003/05/19 15:25:09 ru@ pointed this out to me. Take a guess. We dont seem to have any x86-64/amd64 specific stuff in the tree yet.. OK, the openssl stuff does, but it isn't connected. Affected files ... .. //depot/projects/hammer/share/mk/bsd.cpu.mk#6 edit Differences ... ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#6 (text+ko) ==== @@ -11,8 +11,8 @@ . elif ${MACHINE_ARCH} == "alpha" _CPUCFLAGS = -mcpu=ev4 -mtune=ev5 MACHINE_CPU = ev4 -.elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64" -MACHINE_CPU = x86-64 sse2 sse +.elif ${MACHINE_ARCH} == "amd64" +MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" _CPUCFLAGS = MACHINE_CPU = itanium @@ -128,8 +128,8 @@ . elif ${CPUTYPE} == "ev4" MACHINE_CPU = ev4 . endif -. elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64" -MACHINE_CPU = x86-64 sse2 sse +. elif ${MACHINE_ARCH} == "amd64" +MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" . if ${CPUTYPE} == "itanium" MACHINE_CPU = itanium From owner-p4-projects@FreeBSD.ORG Mon May 19 15:50:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE7E637B404; Mon, 19 May 2003 15:50:22 -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 3E91837B401 for ; Mon, 19 May 2003 15:50:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C819543FB1 for ; Mon, 19 May 2003 15:50:21 -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 h4JMoL0U040867 for ; Mon, 19 May 2003 15:50:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JMoKRH040854 for perforce@freebsd.org; Mon, 19 May 2003 15:50:20 -0700 (PDT) Date: Mon, 19 May 2003 15:50:20 -0700 (PDT) Message-Id: <200305192250.h4JMoKRH040854@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 31492 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, 19 May 2003 22:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=31492 Change 31492 by peter@peter_daintree on 2003/05/19 15:49:29 IFC @31491 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#10 integrate .. //depot/projects/hammer/sys/conf/options.amd64#10 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#11 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 (text+ko) ==== @@ -1,8 +1,32 @@ Supported Processors and Motherboards - Need to write this section. + Currently supported processors are the + Itanium + and the Itanium 2. + + Supported chipsets include: + + + HP zx1 (only on development branch, see the + Perforce repository) + + + HP i2000 + + + Intel 460GX + + + Intel E8870 + + + + Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) + configurations are under active development. At this time, + SMP-enabled systems are considered less stable. The current + priorities are UP fixes to improve stability. ==== //depot/projects/hammer/sys/conf/Makefile.amd64#10 (text+ko) ==== @@ -1,19 +1,19 @@ -# Makefile.x86_64 -- with config changes. +# Makefile.amd64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.7 2003/05/10 01:12:24 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.8 2003/05/19 22:15:30 peter Exp $ # # Makefile for FreeBSD # # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description -# /sys/x86_64/conf/``machineid'' +# /sys/amd64/conf/``machineid'' # after which you should do # config machineid # Generic makefile changes should be made in -# /sys/conf/Makefile.x86_64 +# /sys/conf/Makefile.amd64 # after which config should be rerun for all machines. # ==== //depot/projects/hammer/sys/conf/options.amd64#10 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.7 2003/05/14 04:10:49 peter Exp $ -# Options specific to the AMD x86-64 platform kernels +# $FreeBSD: src/sys/conf/options.amd64,v 1.8 2003/05/19 22:19:02 peter Exp $ +# Options specific to AMD64 platform kernels MAXMEM PERFMON opt_perfmon.h ==== //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.134 2003/04/29 13:36:04 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.135 2003/05/19 22:35:00 peter Exp $"); #include "opt_bootp.h" #include "opt_nfsroot.h" @@ -277,15 +277,18 @@ for (bsize = NFS_FABLKSIZE; ; bsize *= 2) { sbp->f_bsize = bsize; tquad = fxdr_hyper(&sfp->sf_tbytes); - if ((tquad / bsize) > LONG_MAX) + if (((long)(tquad / bsize) > LONG_MAX) || + ((long)(tquad / bsize) < LONG_MIN)) continue; sbp->f_blocks = tquad / bsize; tquad = fxdr_hyper(&sfp->sf_fbytes); - if ((tquad / bsize) > LONG_MAX) + if (((long)(tquad / bsize) > LONG_MAX) || + ((long)(tquad / bsize) < LONG_MIN)) continue; sbp->f_bfree = tquad / bsize; tquad = fxdr_hyper(&sfp->sf_abytes); - if ((tquad / bsize) > LONG_MAX) + if (((long)(tquad / bsize) > LONG_MAX) || + ((long)(tquad / bsize) < LONG_MIN)) continue; sbp->f_bavail = tquad / bsize; sbp->f_files = (fxdr_unsigned(int32_t, From owner-p4-projects@FreeBSD.ORG Tue May 20 00:03:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E16337B404; Tue, 20 May 2003 00:03: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 2DD3637B401 for ; Tue, 20 May 2003 00:03:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFD8143F3F for ; Tue, 20 May 2003 00:03:25 -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 h4K73P0U079731 for ; Tue, 20 May 2003 00:03:25 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4K73Pw7079728 for perforce@freebsd.org; Tue, 20 May 2003 00:03:25 -0700 (PDT) Date: Tue, 20 May 2003 00:03:25 -0700 (PDT) Message-Id: <200305200703.h4K73Pw7079728@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 31507 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, 20 May 2003 07:03:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=31507 Change 31507 by marcel@marcel_nfs on 2003/05/20 00:02:38 IFC @31506 Affected files ... .. //depot/projects/ia64/Makefile.inc1#62 integrate .. //depot/projects/ia64/bin/ed/Makefile#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#5 integrate .. //depot/projects/ia64/games/factor/Makefile#3 integrate .. //depot/projects/ia64/lib/Makefile#25 integrate .. //depot/projects/ia64/lib/libcrypt/Makefile#2 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#14 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#16 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#3 integrate .. //depot/projects/ia64/libexec/Makefile#16 integrate .. //depot/projects/ia64/release/Makefile#52 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#17 integrate .. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#4 integrate .. //depot/projects/ia64/sbin/umount/umount.8#5 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#9 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#31 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#34 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#14 integrate .. //depot/projects/ia64/sys/alpha/include/_limits.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/limits.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/limits.h#2 integrate .. //depot/projects/ia64/sys/arm/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/arm/include/limits.h#5 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/ia64/sys/conf/options.amd64#4 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#24 integrate .. //depot/projects/ia64/sys/i386/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/i386/include/limits.h#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/exception.s#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#63 integrate .. //depot/projects/ia64/sys/ia64/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/limits.h#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/ia64/sys/powerpc/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/powerpc/include/limits.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/limits.h#7 integrate .. //depot/projects/ia64/sys/sys/limits.h#4 integrate .. //depot/projects/ia64/usr.bin/Makefile#47 integrate .. //depot/projects/ia64/usr.bin/fetch/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/delete/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pppd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#62 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.360 2003/05/18 20:22:26 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -8,7 +8,6 @@ # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNOSECURE do not go into secure subdir # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -70,7 +69,7 @@ .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) SUBDIR+= secure .endif .if exists(${.CURDIR}/share) && !defined(NOSHARE) @@ -803,7 +802,7 @@ _generic_libs+= lib -.if !defined(NOCRYPT) && !defined(NOSECURE) +.if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl .if !defined(NO_OPENSSH) ==== //depot/projects/ia64/bin/ed/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.21 2001/12/06 10:50:23 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des 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}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCIPHER} ==== //depot/projects/ia64/contrib/groff/tmac/doc.tmac#5 (text+ko) ==== @@ -3959,15 +3959,16 @@ . ti -\n[doc-reg-dtl]u . . nh -. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\ -. doc-item-box\n[doc-list-depth] +. doc-item-box\n[doc-list-depth] +. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ . br -. \} . el \{\ -. chop doc-item-box\n[doc-list-depth] -. \" Using \Z prevents stretching of the spaces in the tag -. nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c -. nop \h'\n[doc-reg-dtl]u'\c +. \" format the tag separately to prevent stretching of spaces +. vpt 0 +. br +. sp -1 +. vpt 1 +. nop \&\c . nr doc-have-space 1 . \} . ==== //depot/projects/ia64/games/factor/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.5 2002/10/09 19:55:04 fanf Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} ==== //depot/projects/ia64/lib/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.156 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,13 +79,11 @@ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) _libtelnet= libtelnet .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif ==== //depot/projects/ia64/lib/libcrypt/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libcrypt/Makefile,v 1.30 2001/03/27 17:26:59 ru Exp $ +# $FreeBSD: src/lib/libcrypt/Makefile,v 1.31 2003/05/19 15:51:59 des Exp $ # SHLIB_MAJOR= 2 @@ -13,7 +13,7 @@ CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH ==== //depot/projects/ia64/lib/libfetch/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.40 2003/05/01 14:39:43 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $ LIB= fetch CFLAGS+= -I. @@ -9,7 +9,7 @@ MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto ==== //depot/projects/ia64/lib/libpam/modules/modules.inc#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.16 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.17 2003/05/19 15:51:59 des Exp $ MODULES = MODULES += pam_chroot @@ -24,8 +24,7 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) MODULES += pam_ssh .endif MODULES += pam_tacplus ==== //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.2 2003/04/18 07:09:42 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.3 2003/05/19 23:04:49 deischen Exp $"); #include #include @@ -48,7 +48,9 @@ static unsigned int ldt_mask[LDT_WORDS]; static int initialized = 0; -void +static void initialize(void); + +static void initialize(void) { int i, j; ==== //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#8 (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.40 2003/05/16 19:58:29 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.41 2003/05/19 23:04:50 deischen Exp $ */ #include #include @@ -49,10 +49,16 @@ static inline void cond_queue_remove(pthread_cond_t, pthread_t); static inline void cond_queue_enq(pthread_cond_t, pthread_t); +/* + * Double underscore versions are cancellation points. Single underscore + * versions are not and are provided for libc internal usage (which + * shouldn't introduce cancellation points). + */ +__weak_reference(__pthread_cond_wait, pthread_cond_wait); +__weak_reference(__pthread_cond_timedwait, pthread_cond_timedwait); + __weak_reference(_pthread_cond_init, pthread_cond_init); __weak_reference(_pthread_cond_destroy, pthread_cond_destroy); -__weak_reference(_pthread_cond_wait, pthread_cond_wait); -__weak_reference(_pthread_cond_timedwait, pthread_cond_timedwait); __weak_reference(_pthread_cond_signal, pthread_cond_signal); __weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast); @@ -167,22 +173,16 @@ int unlock_mutex = 1; int seqno; - _thr_enter_cancellation_point(curthread); - - if (cond == NULL) { - _thr_leave_cancellation_point(curthread); + if (cond == NULL) return (EINVAL); - } /* * If the condition variable is statically initialized, * perform the dynamic initialization: */ if (*cond == NULL && - (rval = pthread_cond_init(cond, NULL)) != 0) { - _thr_leave_cancellation_point(curthread); + (rval = pthread_cond_init(cond, NULL)) != 0) return (rval); - } /* * Enter a loop waiting for a condition signal or broadcast @@ -348,8 +348,6 @@ curthread->continuation((void *) curthread); } while ((done == 0) && (rval == 0)); - _thr_leave_cancellation_point(curthread); - /* Return the completion status: */ return (rval); } @@ -379,21 +377,16 @@ THR_ASSERT(curthread->locklevel == 0, "cv_timedwait: locklevel is not zero!"); - _thr_enter_cancellation_point(curthread); if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) { - _thr_leave_cancellation_point(curthread); + abstime->tv_nsec >= 1000000000) return (EINVAL); - } /* * If the condition variable is statically initialized, perform dynamic * initialization. */ - if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) { - _thr_leave_cancellation_point(curthread); + if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) return (rval); - } /* * Enter a loop waiting for a condition signal or broadcast @@ -556,8 +549,6 @@ curthread->continuation((void *)curthread); } while ((done == 0) && (rval == 0)); - _thr_leave_cancellation_point(curthread); - /* Return the completion status: */ return (rval); } ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.65 2003/05/16 19:58:29 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.66 2003/05/19 23:04:50 deischen Exp $"); #include #include @@ -117,6 +117,9 @@ static int active_kse_count = 0; static int active_kseg_count = 0; +#ifdef DEBUG_THREAD_KERN +static void dump_queues(struct kse *curkse); +#endif static void kse_check_completed(struct kse *kse); static void kse_check_waitq(struct kse *kse); static void kse_check_signals(struct kse *kse); @@ -762,7 +765,8 @@ } #endif -void +#ifdef DEBUG_THREAD_KERN +static void dump_queues(struct kse *curkse) { struct pthread *thread; @@ -773,6 +777,7 @@ thread, thread->state, thread->blocked); } } +#endif /* * This is the scheduler for a KSE which runs multiple threads. ==== //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.3 2003/04/18 05:04:16 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.4 2003/05/19 23:04:50 deischen Exp $"); #include #include @@ -40,8 +40,10 @@ extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); +__weak_reference(_pselect, pselect); + int -pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, +_pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask) { struct pthread *curthread = _get_curthread(); ==== //depot/projects/ia64/libexec/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.60 2003/05/11 18:48:29 markm Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.61 2003/05/19 15:51:59 des Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -43,8 +43,7 @@ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) # make release needs both SUBDIR+=telnetd .endif ==== //depot/projects/ia64/release/Makefile#52 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.777 2003/05/18 19:34:03 jmallett Exp $ +# $FreeBSD: src/release/Makefile,v 1.778 2003/05/20 01:46:09 scottl Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -190,7 +190,7 @@ FIXITSIZE= 2880 MFSSIZE= 4320 BIGBOOTSIZE= 2880 -DRIVERINODE= 80000 +DRIVERINODE= 40000 BOOTINODE= 80000 FIXITINODE= 40000 MFSINODE= 8000 ==== //depot/projects/ia64/release/alpha/drivers.conf#14 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.18 2003/05/17 11:58:28 wilko Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.19 2003/05/20 01:46:09 scottl Exp $ # # drv: driver name in kernel config file @@ -52,7 +52,6 @@ ahc ahc 3 disk "Adaptec 2940" ahc ahc_eisa 3 disk "Adaptec 2940 EISA" ahc ahc_pci 3 disk "Adaptec 2940 PCI" -isp isp 3 disk "Qlogic SCSI" amr amr 3 disk "AMI MegaRAID" ispfw ispfw 3 disk "Qlogic SCSI firmware modules" mlx mlx 3 disk "Mylex DAC-family RAID" ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.149 2003/05/13 18:15:28 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.150 2003/05/19 21:32:45 blackend Exp $ Supported Devices @@ -3077,7 +3077,7 @@ USB 2.0 controllers using the EHCI - interface (ehci driver) + interface (&man.ehci.4; driver) Hubs ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 (text+ko) ==== @@ -1,8 +1,32 @@ Supported Processors and Motherboards - Need to write this section. + Currently supported processors are the + Itanium + and the Itanium 2. + + Supported chipsets include: + + + HP zx1 (only on development branch, see the + Perforce repository) + + + HP i2000 + + + Intel 460GX + + + Intel E8870 + + + + Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) + configurations are under active development. At this time, + SMP-enabled systems are considered less stable. The current + priorities are UP fixes to improve stability. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.567 2003/05/13 18:15:28 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.569 2003/05/20 04:03:29 bmah Exp $ 2000 @@ -170,7 +170,7 @@ NODEVFS option has been removed from the set of possible kernel configuration options. - An ehci driver has been added; it supports + An &man.ehci.4; driver has been added; it supports the USB Enhanced Host Controller Interface used by USB 2.0 controllers. @@ -1011,7 +1011,7 @@ has been updated to 2.2.1. &merged; The supported release of KDE - has been updated to 3.1.1a. &merged; + has been updated to 3.1.2. &merged; There is no longer a separate krb5 distribution. The Kerberos 5 libraries and utilities have been ==== //depot/projects/ia64/sbin/disklabel/disklabel.8#17 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.51 2003/04/17 17:36:31 trhodes Exp $ +.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.52 2003/05/19 19:52:29 ru Exp $ .\" .Dd March 15, 2003 .Dt DISKLABEL 8 @@ -973,4 +973,4 @@ partition does not start at 0 or does not cover the entire slice, if a partition runs past the end of the device, and a number of other errors, -but no warning is given if space remains unused.+but no warning is given if space remains unused. ==== //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $Revision: 1.10 $ -.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.17 2003/05/04 06:13:25 murray Exp $ +.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.18 2003/05/19 19:54:00 ru Exp $ .\" .Dd June 1, 1996 .Dt RTQUERY 8 @@ -45,17 +45,17 @@ command, an undocumented extension to the RIP protocol supported by the commercial -.Li gated +.Nm gated routing product. When querying -.Li gated , +.Nm gated , the .Em poll command is preferred over the .Em request command because the response is not subject to Split Horizon and/or Poisoned Reverse, and because some versions of -.Li gated +.Nm gated do not answer the .Em request command. @@ -82,9 +82,9 @@ uses the .Em poll command to request full routing information from -.Li gated . +.Nm gated . This is an undocumented extension RIP protocol supported only by -.Li gated . +.Nm gated . .It Fl 1 queries using RIP version 1 instead of RIP version 2. .It Fl w Ar timeout @@ -102,7 +102,7 @@ is one of the following. Requests from processes not running with UID 0 or on distant networks are generally ignored by the daemon except for a message in the system log. -.Li gated +.Nm gated is likely to ignore these debugging requests. .El .Bl -tag -width Ds -offset indent-two ==== //depot/projects/ia64/sbin/umount/umount.8#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)umount.8 8.2 (Berkeley) 5/8/95 -.\" $FreeBSD: src/sbin/umount/umount.8,v 1.16 2003/04/07 22:58:35 mdodd Exp $ +.\" $FreeBSD: src/sbin/umount/umount.8,v 1.17 2003/05/19 19:58:29 ru Exp $ .\" .Dd April 7, 2003 .Dt UMOUNT 8 @@ -121,17 +121,17 @@ is unmounted. .El .Sh ENVIRONMENT -.Bl -tag -width PATH_FSTAB -.It Pa PATH_FSTAB +.Bl -tag -width ".Ev PATH_FSTAB" +.It Ev PATH_FSTAB If the environment variable -.Pa PATH_FSTAB -is set all operations are performed against the specified file. -.Pa PATH_FSTAB +.Ev PATH_FSTAB +is set, all operations are performed against the specified file. +.Ev PATH_FSTAB will not be honored if the process environment or memory address space is considred .Dq tainted . (See -.Fn issetugid +.Xr issetugid 2 for more information.) .El .Sh FILES ==== //depot/projects/ia64/sbin/vinum/vinum.8#9 (text+ko) ==== @@ -35,9 +35,9 @@ .\" advised of the possibility of such damage. .\" .\" $Id: vinum.8,v 1.15 2001/05/14 01:10:37 grog Exp grog $ -.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.62 2003/05/05 16:33:43 phk Exp $ +.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.63 2003/05/19 20:03:28 ru Exp $ .\" -.Dd December 20, 2000 +.Dd May 5, 2003 .Dt VINUM 8 .Os .Sh NAME @@ -2589,7 +2589,6 @@ not partitions such as .Pa /dev/da0e . .El -.\"XXX.Sh BUGS .Sh FILES .Bl -tag -width /dev/vinum/control -compact .It Pa /dev/vinum @@ -2641,8 +2640,10 @@ .Pq Pa www.cybernet.com for its NetMAX product. .Sh BUGS -.Nm +.Xr vinum 4 does not use the .Xr geom 4 -subsystem so vinum volumes can not be used with GEOM based facilities like +subsystem so +.Xr vinum 4 +volumes cannot be used with GEOM based facilities like .Xr gbde 8 . ==== //depot/projects/ia64/share/examples/etc/make.conf#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.214 2003/05/06 19:26:55 obrien Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.215 2003/05/19 15:51:59 des Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -124,7 +124,6 @@ #NOLIBC_R= true # do not build libc_r (re-entrant version of libc) #NOMAN= true # do not build manual pages #NOPROFILE= true # Avoid compiling profiled libraries -#NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir # # To build sys/modules when building the world (our old way of doing things) ==== //depot/projects/ia64/share/man/man5/make.conf.5#34 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.72 2003/05/05 07:58:43 markm Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.73 2003/05/19 15:51:59 des Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -536,11 +536,6 @@ .It Va NOPROFILE .Pq Vt bool Set to avoid compiling profiled libraries. -.It Va NOSECURE -.Pq Vt bool -set to not build crypto code in -.Pa secure -subdir. .It Va NOSHARE .Pq Vt bool Set to not build in the ==== //depot/projects/ia64/share/mk/bsd.cpu.mk#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.26 2003/04/14 17:36:29 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.27 2003/05/20 01:46:16 peter Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -11,8 +11,8 @@ . elif ${MACHINE_ARCH} == "alpha" _CPUCFLAGS = -mcpu=ev4 -mtune=ev5 MACHINE_CPU = ev4 -.elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64" -MACHINE_CPU = x86-64 sse2 sse +.elif ${MACHINE_ARCH} == "amd64" +MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" _CPUCFLAGS = MACHINE_CPU = itanium @@ -128,8 +128,8 @@ . elif ${CPUTYPE} == "ev4" MACHINE_CPU = ev4 . endif -. elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64" -MACHINE_CPU = x86-64 sse2 sse +. elif ${MACHINE_ARCH} == "amd64" +MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" . if ${CPUTYPE} == "itanium" MACHINE_CPU = itanium ==== //depot/projects/ia64/sys/alpha/include/_limits.h#5 (text+ko) ==== @@ -32,14 +32,12 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.13 2003/05/04 22:13:03 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.14 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE__LIMITS_H_ +#ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -51,6 +49,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ ==== //depot/projects/ia64/sys/alpha/include/limits.h#6 (text+ko) ==== @@ -32,10 +32,10 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.11 2003/04/29 13:35:58 kan Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.12 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/ia64/sys/amd64/include/_limits.h#3 (text+ko) ==== @@ -33,14 +33,12 @@ * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.6 2003/05/04 22:13:04 kan Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.7 2003/05/19 20:29:06 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -52,6 +50,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ ==== //depot/projects/ia64/sys/amd64/include/limits.h#2 (text+ko) ==== @@ -33,10 +33,10 @@ * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/limits.h,v 1.5 2003/04/29 13:36:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/ia64/sys/arm/include/_limits.h#4 (text+ko) ==== @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/_limits.h,v 1.5 2003/05/04 22:13:03 kan Exp $ + * $FreeBSD: src/sys/arm/include/_limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -50,6 +48,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ ==== //depot/projects/ia64/sys/arm/include/limits.h#5 (text+ko) ==== @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.4 2003/04/29 13:35:58 kan Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.5 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/ia64/sys/conf/Makefile.amd64#4 (text+ko) ==== @@ -1,19 +1,19 @@ -# Makefile.x86_64 -- with config changes. +# Makefile.amd64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.7 2003/05/10 01:12:24 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.8 2003/05/19 22:15:30 peter Exp $ # # Makefile for FreeBSD # # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description -# /sys/x86_64/conf/``machineid'' +# /sys/amd64/conf/``machineid'' # after which you should do # config machineid # Generic makefile changes should be made in -# /sys/conf/Makefile.x86_64 +# /sys/conf/Makefile.amd64 # after which config should be rerun for all machines. # ==== //depot/projects/ia64/sys/conf/options.amd64#4 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.7 2003/05/14 04:10:49 peter Exp $ -# Options specific to the AMD x86-64 platform kernels +# $FreeBSD: src/sys/conf/options.amd64,v 1.8 2003/05/19 22:19:02 peter Exp $ +# Options specific to AMD64 platform kernels MAXMEM PERFMON opt_perfmon.h ==== //depot/projects/ia64/sys/dev/ata/ata-chipset.c#16 (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.27 2003/05/18 16:45:48 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.28 2003/05/19 13:42:23 sos Exp $ */ #include "opt_ata.h" #include @@ -2003,26 +2003,21 @@ ata_find_chip(device_t dev, struct ata_chip_id *index, int slot) { device_t *children; - u_int32_t devid; - u_int8_t revid; int nchildren, i; - if (device_get_children(device_get_parent(dev), &children, &nchildren)) return 0; - devid = pci_get_devid(dev); - revid = pci_get_revid(dev); - while (index->chipid != 0) { for (i = 0; i < nchildren; i++) { if (((slot >= 0 && pci_get_slot(children[i]) == slot) || slot < 0)&& - pci_get_devid(children[i]) == devid && - pci_get_revid(children[i]) >= revid) { + pci_get_devid(children[i]) == index->chipid && + pci_get_revid(children[i]) >= index->chiprev) { free(children, M_TEMP); return index; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 20 01:00:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF70A37B405; Tue, 20 May 2003 01:00:37 -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 6CCC137B407 for ; Tue, 20 May 2003 01:00:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF09443F3F for ; Tue, 20 May 2003 01:00:36 -0700 (PDT) (envelope-from obrien@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 h4K80a0U088106 for ; Tue, 20 May 2003 01:00:36 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4K80aU8088100 for perforce@freebsd.org; Tue, 20 May 2003 01:00:36 -0700 (PDT) Date: Tue, 20 May 2003 01:00:36 -0700 (PDT) Message-Id: <200305200800.h4K80aU8088100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31510 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, 20 May 2003 08:00:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=31510 Change 31510 by obrien@obrien_trang on 2003/05/20 01:00:31 First pass at setting the arch #ifdef's for Hammer. Affected files ... .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#8 edit .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#5 edit .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#10 edit .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#7 edit .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#8 edit .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#6 edit Differences ... ==== //depot/projects/hammer/usr.sbin/sysinstall/disks.c#8 (text+ko) ==== @@ -234,7 +234,7 @@ static void getBootMgr(char *dname, u_char **bootCode, size_t *bootCodeSize) { -#ifdef __i386__ /* only meaningful on x86 */ +#if defined(__i386__) || defined(__amd64__) /* only meaningful on x86 */ static u_char *mbr, *boot0; static size_t mbr_size, boot0_size; char str[80]; @@ -847,14 +847,14 @@ for (i = 0; devs[i]; i++) { Disk *d = (Disk *)devs[i]->private; static u_char *boot1; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) static u_char *boot2; #endif if (!devs[i]->enabled) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) if (!boot1) boot1 = bootalloc("boot1", NULL); if (!boot2) boot2 = bootalloc("boot2", NULL); Set_Boot_Blocks(d, boot1, boot2); ==== //depot/projects/hammer/usr.sbin/sysinstall/dist.c#5 (text+ko) ==== @@ -224,7 +224,7 @@ DTE_TARBALL("XAGX", &XF86ServerDists, XF86_SERVER_AGX, "/usr/X11R6"), #endif DTE_TARBALL("XI128", &XF86ServerDists, XF86_SERVER_I128, "/usr/X11R6"), -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) DTE_TARBALL("XMa8", &XF86ServerDists, XF86_SERVER_MACH8, "/usr/X11R6"), DTE_TARBALL("XMa32", &XF86ServerDists, XF86_SERVER_MACH32, "/usr/X11R6"), #endif @@ -234,7 +234,7 @@ DTE_TARBALL("XS3", &XF86ServerDists, XF86_SERVER_S3, "/usr/X11R6"), DTE_TARBALL("XS3V", &XF86ServerDists, XF86_SERVER_S3V, "/usr/X11R6"), DTE_TARBALL("XSVGA", &XF86ServerDists, XF86_SERVER_SVGA, "/usr/X11R6"), -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) DTE_TARBALL("XVG16", &XF86ServerDists, XF86_SERVER_VGA16, "/usr/X11R6"), DTE_TARBALL("XW32", &XF86ServerDists, XF86_SERVER_W32, "/usr/X11R6"), #endif ==== //depot/projects/hammer/usr.sbin/sysinstall/install.c#10 (text+ko) ==== @@ -807,7 +807,7 @@ /* All of this is done only as init, just to be safe */ if (RunningAsInit) { -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) if ((fp = fopen("/boot/loader.conf", "a")) != NULL) { if (!kstat || !OnVTY) fprintf(fp, "# -- sysinstall generated deltas -- #\n"); ==== //depot/projects/hammer/usr.sbin/sysinstall/label.c#7 (text+ko) ==== @@ -59,7 +59,7 @@ /* * Minimum partition sizes */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) +#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define ROOT_MIN_SIZE 128 #else #define ROOT_MIN_SIZE 118 ==== //depot/projects/hammer/usr.sbin/sysinstall/menus.c#8 (text+ko) ==== @@ -1420,7 +1420,7 @@ { NULL } }, }; -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) #ifdef PC98 /* IPL type menu */ DMenu MenuIPLType = { ==== //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#6 (text+ko) ==== @@ -54,12 +54,12 @@ /*** Defines ***/ -#if defined(__i386__) || defined(__alpha__) || defined(__ia64__) +#if defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__amd64__) #define WITH_SYSCONS #define WITH_MICE #endif -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) #define WITH_SLICES #endif @@ -421,7 +421,7 @@ extern int StatusLine; /* Where to print our status messages */ extern DMenu MenuInitial; /* Initial installation menu */ extern DMenu MenuFixit; /* Fixit repair menu */ -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) #ifdef PC98 extern DMenu MenuIPLType; /* Type of IPL to write on the disk */ #else From owner-p4-projects@FreeBSD.ORG Tue May 20 01:02:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4C1B37B404; Tue, 20 May 2003 01:02:40 -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 8093237B401 for ; Tue, 20 May 2003 01:02:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14CCA43F3F for ; Tue, 20 May 2003 01:02:40 -0700 (PDT) (envelope-from obrien@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 h4K82d0U088203 for ; Tue, 20 May 2003 01:02:39 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4K82dbP088200 for perforce@freebsd.org; Tue, 20 May 2003 01:02:39 -0700 (PDT) Date: Tue, 20 May 2003 01:02:39 -0700 (PDT) Message-Id: <200305200802.h4K82dbP088200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31511 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, 20 May 2003 08:02:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=31511 Change 31511 by obrien@obrien_trang on 2003/05/20 01:02:36 These should be explicitly defined as 1, per GCC coding rules (which I sometimes depend on). Affected files ... .. //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#2 edit Differences ... ==== //depot/projects/hammer/contrib/gcc/config/i386/biarch64.h#2 (text+ko) ==== @@ -21,5 +21,5 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TARGET_64BIT_DEFAULT -#define TARGET_BI_ARCH +#define TARGET_64BIT_DEFAULT 1 +#define TARGET_BI_ARCH 1 From owner-p4-projects@FreeBSD.ORG Tue May 20 09:43:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08D0A37B404; Tue, 20 May 2003 09:43:11 -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 9323C37B401 for ; Tue, 20 May 2003 09:43:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FED943FDF for ; Tue, 20 May 2003 09:43:10 -0700 (PDT) (envelope-from obrien@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 h4KGh90U026907 for ; Tue, 20 May 2003 09:43:09 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4KGh91c026904 for perforce@freebsd.org; Tue, 20 May 2003 09:43:09 -0700 (PDT) Date: Tue, 20 May 2003 09:43:09 -0700 (PDT) Message-Id: <200305201643.h4KGh91c026904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31517 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, 20 May 2003 16:43:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=31517 Change 31517 by obrien@obrien_trang on 2003/05/20 09:42:41 Remove release.9.alpha as I wasn't able to finish what I wanted to do to it (remove floppies) during the short time I was involved in the release. Leave open the possibility of a hammer-specific release.9. Affected files ... .. //depot/projects/hammer/release/Makefile#19 edit Differences ... ==== //depot/projects/hammer/release/Makefile#19 (text+ko) ==== @@ -760,117 +760,6 @@ .endif touch release.9 -release.9.alpha: -.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} - cp ${RD}/trees/base/etc/disktab /etc - rm -rf ${RD}/mfsfd - mkdir ${RD}/mfsfd - cd ${RD}/mfsfd && \ - mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help - @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ - DIR=${RD}/mfsfd/stand ZIP=false - ( cd ${RD}/mfsfd && \ - for dir in bin sbin ; do \ - ln -sf /stand $$dir; \ - done ) - cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand -.if ${TARGET} == "pc98" - cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf -.endif - cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf - ( for F in defaults/rc.conf netconfig protocols ; do \ - sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ - ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ - done ) - grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \ - ${RD}/trees/base/etc/services | \ - sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ - > ${RD}/mfsfd/stand/etc/services - ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services - ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig - cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp -.if !defined(NODOC) - @for i in ${DIST_DOCS_ARCH_INDEP}; do \ - cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ - done - @for i in ${DIST_DOCS_ARCH_DEP}; do \ - cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ - done - @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT - @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT -.endif - -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd - @mkdir -p ${RD}/mfsfd/boot -.if ${TARGET_ARCH} != "ia64" - @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot -.endif -.if ${TARGET} == "i386" - @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot -.endif - @echo "Making the regular boot floppy." - @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ - tar xf - -C ${RD}/mfsfd/stand -.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) - rm -rf ${RD}/mfsfd/stand/help/* -.endif -.if defined(SMALLBOOTSIZE) -.if exists(${.CURDIR}/${TARGET}/drivers-small.conf) - @rm -rf ${RD}/mfsfd/modules - @mkdir -p ${RD}/mfsfd/modules - @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ - ${.CURDIR}/${TARGET}/drivers-small.conf \ - ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules -.endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ - ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ - ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ - ${BOOTINODE} ${SMALLBOOTLABEL} -.endif -.if exists(${.CURDIR}/${TARGET}/drivers.conf) - @rm -rf ${RD}/mfsfd/modules - @mkdir -p ${RD}/mfsfd/modules - @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ - ${.CURDIR}/${TARGET}/drivers.conf \ - ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules - @rm -rf ${RD}/driversfd - @mkdir ${RD}/driversfd - @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ - ${.CURDIR}/${TARGET}/drivers.conf \ - ${RD}/trees/base/boot/kernel ${RD}/driversfd - -@rmdir ${RD}/driversfd - if [ -d ${RD}/driversfd ]; then \ - sh -e ${DOFS_SH} \ - ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \ - ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \ - cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \ - *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ - fi -.endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ - ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @mkdir -p ${RD}/mfsroot - @cp mfsroot.gz ${RD}/mfsroot -.if !defined(NO_FLOPPIES) -.if defined(BOOTSIZE) - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ - ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} - @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern -.endif -.if defined(SMALLBOOTSIZE) - @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL -.endif -.if defined(BIGBOOTSIZE) - @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG -.endif -.endif - @rm mfsroot mfsroot.gz - @echo "Regular and MFS boot floppies made." -.endif - touch release.9.alpha - # # --==## Create a fixit floppy ##==-- # @@ -1087,7 +976,7 @@ md5 * > CHECKSUM.MD5) \ ) -.if ${TARGET_ARCH} == "alpha" +.if target(release.9.${TARGET_ARCH}) RELEASE9=release.9.${TARGET_ARCH} .else RELEASE9=release.9 From owner-p4-projects@FreeBSD.ORG Tue May 20 09:49:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F38F937B401; Tue, 20 May 2003 09:49:20 -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 2096D37B404 for ; Tue, 20 May 2003 09:49:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A26E543FE5 for ; Tue, 20 May 2003 09:49:18 -0700 (PDT) (envelope-from obrien@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 h4KGnI0U027137 for ; Tue, 20 May 2003 09:49:18 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4KGnHNx027129 for perforce@freebsd.org; Tue, 20 May 2003 09:49:17 -0700 (PDT) Date: Tue, 20 May 2003 09:49:17 -0700 (PDT) Message-Id: <200305201649.h4KGnHNx027129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31518 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, 20 May 2003 16:49:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=31518 Change 31518 by obrien@obrien_trang on 2003/05/20 09:49:05 Replace the 75 uses of ${CHROOT}/mk with ${_MK} so that one may easly change the script name when experimenting. Affected files ... .. //depot/projects/hammer/release/Makefile#20 edit Differences ... ==== //depot/projects/hammer/release/Makefile#20 (text+ko) ==== @@ -244,6 +244,7 @@ CD= ${_R}/cdrom CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +_MK= ${CHROOT}/mk # Where the bootstrap ports (see DOCPORTS) get installed. LOCALDIR= /usr/local/bin @@ -402,10 +403,10 @@ rm foo; \ fi -test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release - echo "#!/bin/sh" > ${CHROOTDIR}/mk - echo "set -ex" >> ${CHROOTDIR}/mk - echo "trap 'umount /dev || true' 0" >> ${CHROOTDIR}/mk - echo "_RELTARGET=\$${1:-doRELEASE}" >> ${CHROOTDIR}/mk + echo "#!/bin/sh" > ${_MK} + echo "set -ex" >> ${_MK} + echo "trap 'umount /dev || true' 0" >> ${_MK} + echo "_RELTARGET=\$${1:-doRELEASE}" >> ${_MK} .for var in \ AUTO_KEYBOARD_DETECT \ BOOT_CONFIG \ @@ -437,40 +438,42 @@ TARGET_ARCH \ WORLD_FLAGS .if defined(${var}) - echo "export ${var}=\"${${var}}\"" >> ${CHROOTDIR}/mk + echo "export ${var}=\"${${var}}\"" >> ${_MK} .endif .endfor # Don't remove this, or the build will fall over! - echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk - echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk - echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk + echo "export RELEASEDIR=${_R}" >> ${_MK} + echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${_MK} + echo "export MANBUILDCAT=YES" >> ${_MK} # NB: these may fail if the host is running w/o devfs - echo "umount /dev >/dev/null 2>&1 || true" >> ${CHROOTDIR}/mk + echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" \ - >> ${CHROOTDIR}/mk - echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk - echo " cd /usr/src" >> ${CHROOTDIR}/mk - echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${CHROOTDIR}/mk - echo " touch /tmp/.world_done" >> ${CHROOTDIR}/mk - echo "fi" >> ${CHROOTDIR}/mk + >> ${_MK} + echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} + echo " cd /usr/src" >> ${_MK} + echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} + echo " touch /tmp/.world_done" >> ${_MK} + echo " ${CROSSMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \\" >> ${_MK} + echo " -DNOPROFILE installworld" >> ${_MK} + echo "fi" >> ${_MK} .if defined(NOPORTS) || defined(NOPORTREADMES) - echo "if false; then" >> ${CHROOTDIR}/mk + echo "if false; then" >> ${_MK} .else - echo "if true; then" >> ${CHROOTDIR}/mk + echo "if true; then" >> ${_MK} .endif - echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - echo " cd /usr/ports" >> ${CHROOTDIR}/mk - echo " make ${PORTREADMES_FLAGS} readmes" >> ${CHROOTDIR}/mk - echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - echo "fi" >> ${CHROOTDIR}/mk - echo "cd /usr/src/release" >> ${CHROOTDIR}/mk - echo "make obj" >> ${CHROOTDIR}/mk - echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk - echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk - chmod 755 ${CHROOTDIR}/mk + echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + echo " cd /usr/ports" >> ${_MK} + echo " make ${PORTREADMES_FLAGS} readmes" >> ${_MK} + echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + echo "fi" >> ${_MK} + echo "cd /usr/src/release" >> ${_MK} + echo "make obj" >> ${_MK} + echo "make \$${_RELTARGET}" >> ${_MK} + echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + chmod 755 ${_MK} # Ensure md.ko is loaded if md(4) is not statically compiled into the kernel -mdconfig 2>/dev/null - env -i /usr/sbin/chroot ${CHROOTDIR} /mk + env -i /usr/sbin/chroot ${_MK:S/\// /g} clean: rm -rf boot_crunch release.[0-9] From owner-p4-projects@FreeBSD.ORG Wed May 21 08:12:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE9A37B405; Wed, 21 May 2003 08:12:07 -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 5512A37B404 for ; Wed, 21 May 2003 08:12:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 133D543F93 for ; Wed, 21 May 2003 08:12:06 -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 h4LFC50U029118 for ; Wed, 21 May 2003 08:12:05 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4LFC4l0029115 for perforce@freebsd.org; Wed, 21 May 2003 08:12:04 -0700 (PDT) Date: Wed, 21 May 2003 08:12:04 -0700 (PDT) Message-Id: <200305211512.h4LFC4l0029115@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 31564 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, 21 May 2003 15:12:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=31564 Change 31564 by jhb@jhb_laptop on 2003/05/21 08:11:24 IFC @31562. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/alpha/include/_limits.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/locore.S#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/smpng/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/limits.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/smpng/sys/arm/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#5 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#23 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#39 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#24 integrate .. //depot/projects/smpng/sys/conf/NOTES#44 integrate .. //depot/projects/smpng/sys/conf/files.amd64#3 integrate .. //depot/projects/smpng/sys/conf/files.ia64#28 integrate .. //depot/projects/smpng/sys/conf/ldscript.ia64#5 integrate .. //depot/projects/smpng/sys/conf/options#54 integrate .. //depot/projects/smpng/sys/conf/options.amd64#3 integrate .. //depot/projects/smpng/sys/conf/options.ia64#14 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/Makefile#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self_context.s#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.h#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/Makefile#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dump_context.c#1 branch .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dumpmyself.c#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-all.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#14 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#35 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#8 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#13 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#8 integrate .. //depot/projects/smpng/sys/dev/md/md.c#36 integrate .. //depot/projects/smpng/sys/dev/sio/sio_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#33 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#33 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#37 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#59 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#4 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#57 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#35 integrate .. //depot/projects/smpng/sys/i386/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#7 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/context.s#1 branch .. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.s#24 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.s#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#55 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#21 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#44 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.s#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/swtch.s#14 delete .. //depot/projects/smpng/sys/ia64/ia64/syscall.s#1 branch .. //depot/projects/smpng/sys/ia64/ia64/trap.c#47 integrate .. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/unwind.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#24 integrate .. //depot/projects/smpng/sys/ia64/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/_regset.h#1 branch .. //depot/projects/smpng/sys/ia64/include/asm.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#12 integrate .. //depot/projects/smpng/sys/ia64/include/db_machdep.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/frame.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/limits.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/ia64/include/proc.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/reg.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/rse.h#2 delete .. //depot/projects/smpng/sys/ia64/include/signal.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/unwind.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#53 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#18 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#54 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#37 integrate .. //depot/projects/smpng/sys/powerpc/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/limits.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/limits.h#7 integrate .. //depot/projects/smpng/sys/sys/ata.h#14 integrate .. //depot/projects/smpng/sys/sys/limits.h#4 integrate .. //depot/projects/smpng/sys/sys/mutex.h#36 integrate .. //depot/projects/smpng/sys/sys/proc.h#87 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#29 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.159 2003/04/21 16:44:04 simokawa Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.160 2003/05/18 20:39:15 ru Exp $ machine alpha cpu EV4 @@ -95,6 +95,7 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices device isp # Qlogic family +device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') ==== //depot/projects/smpng/sys/alpha/include/_limits.h#5 (text+ko) ==== @@ -32,14 +32,12 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.13 2003/05/04 22:13:03 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.14 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE__LIMITS_H_ +#ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -51,6 +49,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ ==== //depot/projects/smpng/sys/alpha/include/limits.h#7 (text+ko) ==== @@ -32,10 +32,10 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.11 2003/04/29 13:35:58 kan Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.12 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.140 2003/05/14 04:10:47 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.141 2003/05/15 00:23:39 peter Exp $ */ #include @@ -106,12 +106,6 @@ pushfq /* PSL */ popq PCB_RFLAGS(%r8) - /* Save kernel %gs.base */ - movl $MSR_GSBASE,%ecx - rdmsr - movl %eax,PCB_KGSBASE(%r8) - movl %edx,PCB_KGSBASE+4(%r8) - /* Save userland %fs */ movl $MSR_FSBASE,%ecx rdmsr @@ -176,12 +170,11 @@ movl PCB_DS(%r8),%ds movl PCB_ES(%r8),%es movl PCB_FS(%r8),%fs - movl PCB_GS(%r8),%gs - /* Restore kernel %gs.base */ + /* Restore userland %gs while preserving kernel gsbase */ movl $MSR_GSBASE,%ecx - movl PCB_KGSBASE(%r8),%eax - movl PCB_KGSBASE+4(%r8),%edx + rdmsr + movl PCB_GS(%r8),%gs wrmsr /* Restore userland %fs */ ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.145 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.146 2003/05/15 00:23:39 peter Exp $ */ #include "opt_compat.h" @@ -125,7 +125,6 @@ ASSYM(PCB_RFLAGS, offsetof(struct pcb, pcb_rflags)); ASSYM(PCB_FSBASE, offsetof(struct pcb, pcb_fsbase)); ASSYM(PCB_GSBASE, offsetof(struct pcb, pcb_gsbase)); -ASSYM(PCB_KGSBASE, offsetof(struct pcb, pcb_kgsbase)); ASSYM(PCB_DS, offsetof(struct pcb, pcb_ds)); ASSYM(PCB_ES, offsetof(struct pcb, pcb_es)); ASSYM(PCB_FS, offsetof(struct pcb, pcb_fs)); ==== //depot/projects/smpng/sys/amd64/amd64/locore.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/amd64/amd64/locore.S,v 1.172 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.173 2003/05/15 00:20:17 peter Exp $ */ #include @@ -34,15 +34,6 @@ #include "assym.s" /* - * PTmap is recursive pagemap at top of virtual address space. - * Within PTmap, the page directory can be found (third indirection). - */ - .globl PTmap,PTD,PTDpde - .set PTmap,(PTDPTDI << PDRSHIFT) - .set PTD,PTmap + (PTDPTDI * PAGE_SIZE) - .set PTDpde,PTD + (PTDPTDI * PDESIZE) - -/* * Compiled KERNBASE location */ .globl kernbase ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#6 (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.577 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.579 2003/05/17 02:05:10 peter Exp $ */ #include "opt_atalk.h" @@ -476,21 +476,15 @@ { struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; - u_int64_t pc; wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; - pcb->pcb_kgsbase = rdmsr(MSR_GSBASE); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); - critical_enter(); - pc = rdmsr(MSR_GSBASE); - load_gs(_udatasel); /* Clobbers kernel %GS.base */ - wrmsr(MSR_GSBASE, pc); - critical_exit(); + load_gs(_udatasel); pcb->pcb_ds = _udatasel; pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; @@ -728,7 +722,7 @@ { sd->sd_lobase = (ssd->ssd_base) & 0xffffff; - sd->sd_hibase = (ssd->ssd_base >> 24) & 0xffffff; + sd->sd_hibase = (ssd->ssd_base >> 24) & 0xfffffffffful; sd->sd_lolimit = (ssd->ssd_limit) & 0xffff; sd->sd_hilimit = (ssd->ssd_limit >> 16) & 0xf; sd->sd_type = ssd->ssd_type; @@ -1317,7 +1311,6 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ thread0.td_pcb->pcb_cr3 = IdlePML4; - thread0.td_pcb->pcb_kgsbase = (u_int64_t)pc; thread0.td_frame = &proc0_tf; } ==== //depot/projects/smpng/sys/amd64/ia32/ia32_sysvec.c#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/sys/amd64/ia32/ia32_sysvec.c,v 1.3 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.4 2003/05/15 00:23:39 peter Exp $ */ #include "opt_compat.h" @@ -241,22 +241,15 @@ { struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; - u_int64_t pc; - register_t s; wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; - pcb->pcb_kgsbase = rdmsr(MSR_GSBASE); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); - s = intr_disable(); - pc = rdmsr(MSR_GSBASE); - load_gs(_udatasel); /* Clobbers kernel %GS.base */ - wrmsr(MSR_GSBASE, pc); - intr_restore(s); + load_gs(_udatasel); pcb->pcb_ds = _udatasel; pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; ==== //depot/projects/smpng/sys/amd64/include/_limits.h#2 (text+ko) ==== @@ -33,14 +33,12 @@ * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.6 2003/05/04 22:13:04 kan Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.7 2003/05/19 20:29:06 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -52,6 +50,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ ==== //depot/projects/smpng/sys/amd64/include/cpufunc.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.135 2003/05/14 04:10:49 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.136 2003/05/15 00:23:40 peter Exp $ */ /* @@ -475,6 +475,41 @@ __asm __volatile("movl %0,%%es" : : "rm" (sel)); } +#ifdef _KERNEL +/* This is defined in but is too painful to get to */ +#ifndef MSR_FSBASE +#define MSR_FSBASE 0xc0000100 +#endif +static __inline void +load_fs(u_int sel) +{ + register u_int32_t fsbase __asm("ecx"); + + /* Preserve the fsbase value across the selector load */ + fsbase = MSR_FSBASE; + __asm __volatile("rdmsr; movl %0,%%fs; wrmsr" + : : "rm" (sel), "c" (fsbase) : "eax", "edx"); +} + +#ifndef MSR_GSBASE +#define MSR_GSBASE 0xc0000101 +#endif +static __inline void +load_gs(u_int sel) +{ + register u_int32_t gsbase __asm("ecx"); + + /* + * Preserve the gsbase value across the selector load. + * Note that we have to disable interrupts because the gsbase + * being trashed happens to be the kernel gsbase at the time. + */ + gsbase = MSR_GSBASE; + __asm __volatile("pushfq; cli; rdmsr; movl %0,%%gs; wrmsr; popfq" + : : "rm" (sel), "c" (gsbase) : "eax", "edx"); +} +#else +/* Usable by userland */ static __inline void load_fs(u_int sel) { @@ -486,6 +521,7 @@ { __asm __volatile("movl %0,%%gs" : : "rm" (sel)); } +#endif /* void lidt(struct region_descriptor *addr); */ static __inline void ==== //depot/projects/smpng/sys/amd64/include/limits.h#2 (text+ko) ==== @@ -33,10 +33,10 @@ * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/limits.h,v 1.5 2003/04/29 13:36:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/smpng/sys/amd64/include/pcb.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.52 2003/05/14 04:10:49 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.53 2003/05/15 00:23:40 peter Exp $ */ #ifndef _I386_PCB_H_ @@ -59,7 +59,6 @@ register_t pcb_rflags; register_t pcb_fsbase; register_t pcb_gsbase; - register_t pcb_kgsbase; u_int32_t pcb_ds; u_int32_t pcb_es; u_int32_t pcb_fs; ==== //depot/projects/smpng/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.100 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.101 2003/05/15 00:20:17 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -145,13 +145,9 @@ * in the page tables and the evil overlapping. */ #ifdef _KERNEL -extern pt_entry_t PTmap[]; -extern pd_entry_t PDmap[]; -extern pdp_entry_t PDPmap[]; -extern pml4_entry_t PML4[]; -extern pdp_entry_t PDP[]; -extern pd_entry_t PTD[]; -extern pd_entry_t PTDpde[]; +#define PTmap ((pt_entry_t *)(VADDR(0, 0, PTDPTDI, 0))) +#define PTD ((pd_entry_t *)(VADDR(0, 0, PTDPTDI, PTDPTDI))) +#define PTDpde ((pd_entry_t *)(VADDR(0, 0, PTDPTDI, PTDPTDI) + (PTDPTDI * sizeof(pd_entry_t)))) extern u_int64_t IdlePML4; /* physical address of "Idle" state directory */ extern u_int64_t IdlePDP; /* physical address of "Idle" state directory */ ==== //depot/projects/smpng/sys/arm/include/_limits.h#4 (text+ko) ==== @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/_limits.h,v 1.5 2003/05/04 22:13:03 kan Exp $ + * $FreeBSD: src/sys/arm/include/_limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ -#define __CHAR_BIT 8 /* number of bits in a char */ - /* * According to ANSI (section 2.2.4.2), the values below must be usable by * #if preprocessing directives. Additionally, the expression must have the @@ -50,6 +48,8 @@ * some other compilers as well, but this should not be depended on. */ +#define __CHAR_BIT 8 /* number of bits in a char */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ ==== //depot/projects/smpng/sys/arm/include/limits.h#5 (text+ko) ==== @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.4 2003/04/29 13:35:58 kan Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.5 2003/05/19 20:29:06 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #if __GNUC__ ==== //depot/projects/smpng/sys/boot/common/loader.8#23 (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.55 2003/05/04 08:23:24 murray Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.56 2003/05/17 22:17:23 ru Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -446,9 +446,11 @@ Modifies .Va NMBCLUSTERS . .It Va kern.ipc.nsfbufs -Set the number of sendfile buffers to be allocated. -Modifies -.Va NSFBUFS . +Set the number of +.Xr sendfile 2 +buffers to be allocated. +Overrides +.Dv NSFBUFS . .It Va kern.vm.kmem.size Sets the size of kernel memory (bytes). This overrides the value determined when the kernel was compiled. ==== //depot/projects/smpng/sys/boot/forth/loader.conf#18 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.70 2003/03/11 12:09:25 ru Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.71 2003/05/16 04:31:00 murray Exp $ ############################################################## ### Basic configuration options ############################ @@ -179,6 +179,7 @@ miibus_load="NO" # miibus support, needed for some drivers if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i +if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs if_bge_load="NO" # Broadcom BCM570x PCI gigabit ethernet if_cm_load="NO" # SMC (90c26, 90c56, 90c66) if_dc_load="NO" # DEC/Intel 21143 and various workalikes @@ -186,12 +187,16 @@ if_ed_load="NO" # National Semiconductor DS8390/WD83C690 ethernet if_el_load="NO" # 3Com Etherlink 3C501 if_em_load="NO" # Intel(R) PRO/1000 gigabit ethernet +if_en_load="NO" # Midway-based ATM interfaces if_ep_load="NO" # 3Com Etherlink III (3c5x9) +if_ex_load="NO" # Intel EtherExpress Pro/10 ethernet if_fe_load="NO" # Fujitsu MB86960A/MB86965A based Ethernet adapters if_fxp_load="NO" # Intel EtherExpress PRO/100B (82557, 82558) if_gx_load="NO" # Intel Pro/1000 gigabit ethernet +if_ie_load="NO" # Intel 82586 if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI gigabit ethernet if_lnc_load="NO" # AMD Lance/PCnet Ethernet +if_my_load="NO" # Myson PCI fast ethernet if_nge_load="NO" # National Semiconductor PCI gigabit ethernet if_oltr_load="NO" # Olicom if_pcn_load="NO" # AMD PCnet PCI @@ -287,6 +292,7 @@ umodem_load="NO" # Modems uscanner_load="NO" # Scanners if_aue_load="NO" # ADMtek USB ethernet +if_axe_load="NO" # ASIX Electronics AX88172 USB ethernet if_cue_load="NO" # CATC USB ethernet if_kue_load="NO" # Kawasaki LSI USB ethernet ==== //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.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/boot/i386/libi386/amd64_tramp.S,v 1.1 2003/05/01 03:56:29 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/amd64_tramp.S,v 1.2 2003/05/17 00:30:51 peter Exp $ */ /* @@ -108,6 +108,6 @@ /* We're still running V=P, jump to entry point */ movl %esi, %eax salq $32, %rax - movl %edi, %eax + orq %rdi, %rax pushq %rax ret ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#39 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.142 2003/05/03 00:21:40 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.143 2003/05/15 17:35:35 njl Exp $ */ #ifdef _KERNEL @@ -499,6 +499,14 @@ */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE + }, + { + /* + * OTi USB Flash Key + * PR: kern/51825 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "OTi", "Flash Disk", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; ==== //depot/projects/smpng/sys/conf/Makefile.amd64#3 (text+ko) ==== @@ -1,19 +1,19 @@ -# Makefile.x86_64 -- with config changes. +# Makefile.amd64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.7 2003/05/10 01:12:24 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.8 2003/05/19 22:15:30 peter Exp $ # # Makefile for FreeBSD # # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description -# /sys/x86_64/conf/``machineid'' +# /sys/amd64/conf/``machineid'' # after which you should do # config machineid # Generic makefile changes should be made in -# /sys/conf/Makefile.x86_64 +# /sys/conf/Makefile.amd64 # after which config should be rerun for all machines. # ==== //depot/projects/smpng/sys/conf/Makefile.ia64#24 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.55 2003/04/15 21:29:11 phk Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.56 2003/05/16 21:26:40 marcel Exp $ # # Makefile for FreeBSD # @@ -32,6 +32,8 @@ .endif .include "$S/conf/kern.pre.mk" +INCLUDES+= -I$S/contrib/ia64/libuwx/src + CFLAGS+= -mconstant-gp ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS} ==== //depot/projects/smpng/sys/conf/NOTES#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1148 2003/05/05 21:21:31 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1149 2003/05/15 02:10:29 jmallett Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -208,10 +208,19 @@ # # Implement system calls compatible with 4.3BSD and older versions of # FreeBSD. You probably do NOT want to remove this as much current code -# still relies on the 4.3 emulation. +# still relies on the 4.3 emulation. Note that some architectures that +# are supported by FreeBSD do not include support for certain important +# aspects of this compatibility option, namely those related to the +# signal delivery mechanism. # options COMPAT_43 +# +# Be compatible with SunOS. The COMPAT_43 option above pulls in most +# (all?) of the changes that this option turns on. +# +options COMPAT_SUNOS + # Enable FreeBSD4 compatibility syscalls options COMPAT_FREEBSD4 ==== //depot/projects/smpng/sys/conf/files.amd64#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.amd64,v 1.14 2003/05/14 04:10:49 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.15 2003/05/16 02:27:17 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -16,7 +16,7 @@ # ia32_assym.h optional ia32 \ dependency "$S/kern/genassym.sh ia32_genassym.o" \ - compile-with "sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \ + compile-with "env NM=${NM} sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \ no-obj no-implicit-rule before-depend \ clean "ia32_assym.h" # ==== //depot/projects/smpng/sys/conf/files.ia64#28 (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.51 2003/04/29 05:38:41 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.52 2003/05/16 21:26:40 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,6 +18,19 @@ no-obj no-implicit-rule before-depend \ clean "atkbdmap.h" # +contrib/ia64/libuwx/src/uwx_bstream.c standard +contrib/ia64/libuwx/src/uwx_context.c standard +contrib/ia64/libuwx/src/uwx_env.c standard +contrib/ia64/libuwx/src/uwx_scoreboard.c standard +#contrib/ia64/libuwx/src/uwx_self.c standard +#contrib/ia64/libuwx/src/uwx_self_context.s standard +contrib/ia64/libuwx/src/uwx_step.c standard +contrib/ia64/libuwx/src/uwx_str.c standard +contrib/ia64/libuwx/src/uwx_swap.c standard +contrib/ia64/libuwx/src/uwx_trace.c standard +#contrib/ia64/libuwx/src/uwx_ttrace.c standard +contrib/ia64/libuwx/src/uwx_uinfo.c standard +contrib/ia64/libuwx/src/uwx_utable.c standard crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional crypto @@ -62,6 +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/critical.c standard ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb @@ -88,8 +102,8 @@ ia64/ia64/ssc.c optional ski ia64/ia64/sscdisk.c optional ski ia64/ia64/support.s standard -ia64/ia64/swtch.s standard ia64/ia64/sys_machdep.c standard +ia64/ia64/syscall.s standard ia64/ia64/trap.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ==== //depot/projects/smpng/sys/conf/ldscript.ia64#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.8 2002/12/05 18:35:44 obrien Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.9 2003/05/16 06:03:45 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) @@ -8,107 +8,115 @@ { /* Read-only sections, merged into text segment: */ . = kernel_text + SIZEOF_HEADERS; - - .text : + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rela.init : { *(.rela.init) } + .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } + .rela.fini : { *(.rela.fini) } + .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } + .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } + .rela.ctors : { *(.rela.ctors) } + .rela.dtors : { *(.rela.dtors) } + .rela.got : { *(.rela.got) } + .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } + .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } + .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } + .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } + .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } + .rela.plt : { *(.rela.plt) } + .rela.IA_64.pltoff : { *(.rela.IA_64.pltoff) } + .init : + { + *(.init) + } =0x00300000010070000002000001000400 + .plt : { *(.plt) } + .text : { - *(.text.ivt) - . += 8192; - *(.text) - *(.stub) + *(.text .stub .text.* .gnu.linkonce.t.*) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x47ff041f - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x47ff041f + } =0x00300000010070000002000001000400 + .fini : + { + *(.fini) + } =0x00300000010070000002000001000400 _etext = .; PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .reginfo : { *(.reginfo) } - .IA_64.unwind_info : { *(.IA_64.unwind_info*) } - .IA_64.unwind : { *(.IA_64.unwind*) } + .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } + .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } + .opd : { *(.opd) } + .IA_64.unwind_info : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) } + .IA_64.unwind : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) } /* Adjust the address for the data segment. We want to adjust up to the same address within the page on the next page up. */ - . = .; - .data : + . = . + 8192; + .data : { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS + *(.data.proc0 .data .data.* .gnu.linkonce.d.*) + SORT(CONSTRUCTORS) } - .data1 : { *(.data1) } - .ctors : + .data1 : { *(.data1) } + .dynamic : { *(.dynamic) } + .ctors : { *(.ctors) + *(SORT(.ctors.*)) } - .dtors : + .dtors : { *(.dtors) + *(SORT(.dtors.*)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 21 11:37:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6887A37B404; Wed, 21 May 2003 11:37: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 E808737B401 for ; Wed, 21 May 2003 11:37:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B868943F85 for ; Wed, 21 May 2003 11:37:25 -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 h4LIbP0U046586 for ; Wed, 21 May 2003 11:37:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4LIbOLj046583 for perforce@freebsd.org; Wed, 21 May 2003 11:37:24 -0700 (PDT) Date: Wed, 21 May 2003 11:37:24 -0700 (PDT) Message-Id: <200305211837.h4LIbOLj046583@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 31574 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, 21 May 2003 18:37:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=31574 Change 31574 by peter@peter_daintree on 2003/05/21 11:36:39 IFC @31573 Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/ksd.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#3 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/hammer/release/Makefile#21 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 integrate .. //depot/projects/hammer/share/man/man4/agp.4#3 integrate .. //depot/projects/hammer/share/man/man4/bge.4#5 integrate .. //depot/projects/hammer/share/man/man4/dpt.4#3 integrate .. //depot/projects/hammer/share/man/man4/em.4#3 integrate .. //depot/projects/hammer/share/man/man4/geom.4#4 integrate .. //depot/projects/hammer/share/man/man4/ip.4#6 integrate .. //depot/projects/hammer/share/man/man4/mac.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_ifoff.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_lomac.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_none.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_partition.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_test.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_bluetooth.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_bt3c.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_btsocket.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_h4.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_hci.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_l2cap.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#4 integrate .. //depot/projects/hammer/share/man/man4/oldcard.4#3 integrate .. //depot/projects/hammer/share/man/man4/raid.4#3 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#4 integrate .. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/hammer/share/man/man4/umass.4#7 integrate .. //depot/projects/hammer/share/man/man4/wi.4#8 integrate .. //depot/projects/hammer/share/man/man5/fs.5#4 integrate .. //depot/projects/hammer/share/man/man5/procfs.5#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/hammer/share/man/man7/development.7#2 integrate .. //depot/projects/hammer/share/man/man7/maclabel.7#3 integrate .. //depot/projects/hammer/share/man/man7/release.7#9 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#4 integrate .. //depot/projects/hammer/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/hammer/share/man/man9/byteorder.9#4 integrate .. //depot/projects/hammer/share/man/man9/device_get_ivars.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_get_softc.9#3 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#5 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#6 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#5 integrate .. //depot/projects/hammer/share/man/man9/signal.9#4 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#7 integrate .. //depot/projects/hammer/share/mk/bsd.info.mk#2 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#4 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.s#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#12 integrate .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.1#4 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 integrate .. //depot/projects/hammer/usr.bin/catman/catman.c#6 integrate .. //depot/projects/hammer/usr.bin/logger/logger.1#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.8#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.8#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#3 integrate Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/ksd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.2 2003/04/18 07:09:42 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.3 2003/05/19 23:04:49 deischen Exp $"); #include #include @@ -48,7 +48,9 @@ static unsigned int ldt_mask[LDT_WORDS]; static int initialized = 0; -void +static void initialize(void); + +static void initialize(void) { int i, j; ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#6 (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.40 2003/05/16 19:58:29 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.41 2003/05/19 23:04:50 deischen Exp $ */ #include #include @@ -49,10 +49,16 @@ static inline void cond_queue_remove(pthread_cond_t, pthread_t); static inline void cond_queue_enq(pthread_cond_t, pthread_t); +/* + * Double underscore versions are cancellation points. Single underscore + * versions are not and are provided for libc internal usage (which + * shouldn't introduce cancellation points). + */ +__weak_reference(__pthread_cond_wait, pthread_cond_wait); +__weak_reference(__pthread_cond_timedwait, pthread_cond_timedwait); + __weak_reference(_pthread_cond_init, pthread_cond_init); __weak_reference(_pthread_cond_destroy, pthread_cond_destroy); -__weak_reference(_pthread_cond_wait, pthread_cond_wait); -__weak_reference(_pthread_cond_timedwait, pthread_cond_timedwait); __weak_reference(_pthread_cond_signal, pthread_cond_signal); __weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast); @@ -167,22 +173,16 @@ int unlock_mutex = 1; int seqno; - _thr_enter_cancellation_point(curthread); - - if (cond == NULL) { - _thr_leave_cancellation_point(curthread); + if (cond == NULL) return (EINVAL); - } /* * If the condition variable is statically initialized, * perform the dynamic initialization: */ if (*cond == NULL && - (rval = pthread_cond_init(cond, NULL)) != 0) { - _thr_leave_cancellation_point(curthread); + (rval = pthread_cond_init(cond, NULL)) != 0) return (rval); - } /* * Enter a loop waiting for a condition signal or broadcast @@ -348,8 +348,6 @@ curthread->continuation((void *) curthread); } while ((done == 0) && (rval == 0)); - _thr_leave_cancellation_point(curthread); - /* Return the completion status: */ return (rval); } @@ -379,21 +377,16 @@ THR_ASSERT(curthread->locklevel == 0, "cv_timedwait: locklevel is not zero!"); - _thr_enter_cancellation_point(curthread); if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) { - _thr_leave_cancellation_point(curthread); + abstime->tv_nsec >= 1000000000) return (EINVAL); - } /* * If the condition variable is statically initialized, perform dynamic * initialization. */ - if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) { - _thr_leave_cancellation_point(curthread); + if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) return (rval); - } /* * Enter a loop waiting for a condition signal or broadcast @@ -556,8 +549,6 @@ curthread->continuation((void *)curthread); } while ((done == 0) && (rval == 0)); - _thr_leave_cancellation_point(curthread); - /* Return the completion status: */ return (rval); } ==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.65 2003/05/16 19:58:29 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.66 2003/05/19 23:04:50 deischen Exp $"); #include #include @@ -117,6 +117,9 @@ static int active_kse_count = 0; static int active_kseg_count = 0; +#ifdef DEBUG_THREAD_KERN +static void dump_queues(struct kse *curkse); +#endif static void kse_check_completed(struct kse *kse); static void kse_check_waitq(struct kse *kse); static void kse_check_signals(struct kse *kse); @@ -762,7 +765,8 @@ } #endif -void +#ifdef DEBUG_THREAD_KERN +static void dump_queues(struct kse *curkse) { struct pthread *thread; @@ -773,6 +777,7 @@ thread, thread->state, thread->blocked); } } +#endif /* * This is the scheduler for a KSE which runs multiple threads. ==== //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.3 2003/04/18 05:04:16 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.4 2003/05/19 23:04:50 deischen Exp $"); #include #include @@ -40,8 +40,10 @@ extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); +__weak_reference(_pselect, pselect); + int -pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, +_pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask) { struct pthread *curthread = _get_curthread(); ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#3 (text+ko) ==== @@ -23,27 +23,35 @@ * (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/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.5 2003/05/21 08:21:24 mtm Exp $ */ #include #include +#include #include #include #include +#include "thr_private.h" + #define MAXTHR 128 #define LDT_INDEX(x) (((long)(x) - (long)ldt_entries) / sizeof(ldt_entries[0])) -void **ldt_free = NULL; -static int ldt_inited = 0; -void *ldt_entries[MAXTHR]; +void **ldt_free = NULL; +void *ldt_entries[MAXTHR]; +static int ldt_inited = 0; +static spinlock_t ldt_lock = _SPINLOCK_INITIALIZER; static void ldt_init(void); +/* + * Initialize the array of ldt_entries and the next free slot. + * This routine must be called with the global ldt lock held. + */ static void ldt_init(void) { @@ -62,21 +70,32 @@ void _retire_thread(void *entry) { + _SPINLOCK(&ldt_lock); if (ldt_free == NULL) *(void **)entry = NULL; else *(void **)entry = *ldt_free; ldt_free = entry; + _SPINUNLOCK(&ldt_lock); } void * -_set_curthread(ucontext_t *uc, void *thr) +_set_curthread(ucontext_t *uc, struct pthread *thr) { union descriptor desc; void **ldt_entry; int ldt_index; int error; + /* + * If we are setting up the initial thread, the gs register + * won't be setup for the current thread. In any case, we + * don't need protection from re-entrancy at this point in + * the life of the program. + */ + if (thr != _thread_initial) + _SPINLOCK(&ldt_lock); + if (ldt_inited == NULL) ldt_init(); @@ -89,11 +108,14 @@ ldt_entry = ldt_free; ldt_free = (void **)*ldt_entry; + if (thr != _thread_initial) + _SPINUNLOCK(&ldt_lock); + /* * Cache the address of the thread structure here. This is * what the gs register will point to. */ - *ldt_entry = thr; + *ldt_entry = (void *)thr; ldt_index = LDT_INDEX(ldt_entry); bzero(&desc, sizeof(desc)); ==== //depot/projects/hammer/lib/libthr/thread/thr_cond.c#3 (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_cond.c,v 1.4 2003/05/15 18:17:13 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.5 2003/05/21 03:41:07 mtm Exp $ */ #include #include @@ -518,7 +518,15 @@ cond_queue_enq(pthread_cond_t cond, pthread_t pthread) { pthread_t tid = TAILQ_LAST(&cond->c_queue, cond_head); + char *name; + name = pthread->name ? pthread->name : "unknown"; + if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on condq\n", + pthread->name, pthread->uniqueid); + if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on mutexq\n", + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#3 (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_create.c,v 1.4 2003/04/20 02:56:12 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.5 2003/05/21 03:34:54 mtm Exp $ */ #include #include @@ -200,10 +200,8 @@ * Start a garbage collector thread * if necessary. */ -#if 0 if (f_gc && pthread_create(&gc_thread,NULL, _thread_gc,NULL) != 0) PANIC("Can't create gc thread"); -#endif return (0); } ==== //depot/projects/hammer/lib/libthr/thread/thr_exit.c#2 (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.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.3 2003/05/21 03:29:18 mtm Exp $ */ #include #include @@ -171,6 +171,10 @@ PTHREAD_SET_STATE(curthread, PS_DEAD); GIANT_UNLOCK(curthread); + /* If we're the last thread, call it quits */ + if (TAILQ_EMPTY(&_thread_list)) + exit(curthread->ret); + /* * Retire the architecture specific id so that it can be used for * new threads. ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#2 (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_init.c,v 1.3 2003/04/03 03:34:50 jake Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.4 2003/05/21 03:22:36 mtm Exp $ */ /* Allocate space for global thread variables here: */ @@ -218,11 +218,12 @@ */ PANIC("Cannot allocate memory for initial thread"); } + /* Zero the initial thread structure: */ + memset(pthread, 0, sizeof(struct pthread)); + _thread_initial = pthread; pthread->arch_id = _set_curthread(NULL, pthread); - /* Zero the initial thread structure: */ - memset(pthread, 0, sizeof(struct pthread)); /* Get our thread id. */ thr_self(&pthread->thr_id); ==== //depot/projects/hammer/lib/libthr/thread/thr_join.c#2 (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_join.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.4 2003/05/20 18:48:41 mtm Exp $ */ #include #include @@ -104,7 +104,6 @@ ret = ENOTSUP; goto out; - /* Check if the thread is not dead: */ } /* * Unlock the garbage collector mutex, now that the garbage collector @@ -113,6 +112,7 @@ if (pthread_mutex_unlock(&_gc_mutex) != 0) PANIC("Cannot lock gc mutex"); + /* Check if the thread is not dead: */ if (pthread->state != PS_DEAD) { /* Set the running thread to be the joiner: */ pthread->joiner = curthread; ==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.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_mutex.c,v 1.6 2003/05/12 10:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.7 2003/05/21 03:41:07 mtm Exp $ */ #include #include @@ -1348,7 +1348,15 @@ mutex_queue_enq(pthread_mutex_t mutex, pthread_t pthread) { pthread_t tid = TAILQ_LAST(&mutex->m_queue, mutex_head); + char *name; + name = pthread->name ? pthread->name : "unknown"; + if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on condq\n", + pthread->name, pthread->uniqueid); + if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on mutexq\n", + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* * For the common case of all threads having equal priority, ==== //depot/projects/hammer/release/Makefile#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.777 2003/05/18 19:34:03 jmallett Exp $ +# $FreeBSD: src/release/Makefile,v 1.778 2003/05/20 01:46:09 scottl Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -190,7 +190,7 @@ FIXITSIZE= 2880 MFSSIZE= 4320 BIGBOOTSIZE= 2880 -DRIVERINODE= 80000 +DRIVERINODE= 40000 BOOTINODE= 80000 FIXITINODE= 40000 MFSINODE= 8000 ==== //depot/projects/hammer/release/alpha/drivers.conf#10 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.18 2003/05/17 11:58:28 wilko Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.19 2003/05/20 01:46:09 scottl Exp $ # # drv: driver name in kernel config file @@ -52,7 +52,6 @@ ahc ahc 3 disk "Adaptec 2940" ahc ahc_eisa 3 disk "Adaptec 2940 EISA" ahc ahc_pci 3 disk "Adaptec 2940 PCI" -isp isp 3 disk "Qlogic SCSI" amr amr 3 disk "AMI MegaRAID" ispfw ispfw 3 disk "Qlogic SCSI firmware modules" mlx mlx 3 disk "Mylex DAC-family RAID" ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.568 2003/05/19 21:30:09 blackend Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.569 2003/05/20 04:03:29 bmah Exp $ 2000 @@ -1011,7 +1011,7 @@ has been updated to 2.2.1. &merged; The supported release of KDE - has been updated to 3.1.1a. &merged; + has been updated to 3.1.2. &merged; There is no longer a separate krb5 distribution. The Kerberos 5 libraries and utilities have been ==== //depot/projects/hammer/share/man/man4/agp.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/agp.4,v 1.4 2003/05/12 21:34:29 hmp Exp $ +.\" $FreeBSD: src/share/man/man4/agp.4,v 1.5 2003/05/20 22:06:43 ru Exp $ .\" .Dd October 5, 2001 .Dt AGP 4 @@ -65,7 +65,8 @@ .Pa /dev/agpgart , which are defined in .Aq Pa sys/agpio.h : -.Ss Dv AGPIOC_INFO +.Bl -tag -width indent +.It Dv AGPIOC_INFO Returns state of the .Nm system. @@ -82,16 +83,16 @@ size_t pg_used; /* current pages used */ } agp_info; .Ed -.Ss Dv AGPIOC_ACQUIRE +.It Dv AGPIOC_ACQUIRE Acquire control of the AGP chipset for use by this client. Returns .Er EBUSY if the AGP chipset is already acquired by another client. -.Ss Dv AGPIOC_RELEASE +.It Dv AGPIOC_RELEASE Release control of the AGP chipset. This does not unbind or free any allocated memory, which is the responsibility of the client to handle if necessary. -.Ss Dv AGPIOC_SETUP +.It Dv AGPIOC_SETUP Enable the AGP hardware with the relevant mode. This .Xr ioctl 2 @@ -104,7 +105,7 @@ .Pp The mode bits are defined in .Aq Pa sys/agpio.h . -.Ss Dv AGPIOC_ALLOCATE +.It Dv AGPIOC_ALLOCATE Allocate physical memory suitable for mapping into the AGP aperture. This .Xr ioctl 2 @@ -114,17 +115,17 @@ int key; /* tag of allocation */ size_t pg_count; /* number of pages */ u_int32_t type; /* 0 == normal, other devspec */ - u_int32_t physical; /* device specific (some devices - * need a phys address of the + u_int32_t physical; /* device specific (some devices + * need a phys address of the * actual page behind the gatt * table) */ } agp_allocate; .Ed .Pp Returns a handle to the allocated memory. -.Ss Dv AGPIOC_DEALLOCATE +.It Dv AGPIOC_DEALLOCATE Free the previously allocated memory associated with the handle passed. -.Ss Dv AGPIOC_BIND +.It Dv AGPIOC_BIND Bind the allocated memory at given offset with the AGP aperture. Returns .Er EINVAL @@ -139,17 +140,15 @@ } agp_bind; .Ed .Pp -The -.Sq tag of allocation , -is the handle returned by -.Dv AGPIOC_ALLOCATE. -.Ss Dv AGPIOC_UNBIND +The tag of allocation is the handle returned by +.Dv AGPIOC_ALLOCATE . +.It Dv AGPIOC_UNBIND Unbind memory from the AGP aperture. Returns .Er EINVAL if the memory is not bound. This -.Xr ioctl +.Xr ioctl 2 takes the following structure: .Bd -literal typedef struct _agp_unbind { @@ -157,6 +156,7 @@ u_int32_t priority; /* priority for paging out */ } agp_unbind; .Ed +.El .Sh FILES .Bl -tag -width ".Pa /dev/agpgart" -compact .It Pa /dev/agpgart ==== //depot/projects/hammer/share/man/man4/bge.4#5 (text+ko) ==== @@ -29,7 +29,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/bge.4,v 1.7 2003/03/25 18:08:57 ps Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.8 2003/05/20 22:07:03 ru Exp $ .\" .Dd September 27, 2001 .Dt BGE 4 @@ -129,7 +129,8 @@ .Cm half-duplex modes. .It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. Only +Set 1000baseTX operation over twisted pair. +Only .Cm full-duplex mode is supported. .It Cm 1000baseSX ==== //depot/projects/hammer/share/man/man4/dpt.4#3 (text+ko) ==== @@ -21,7 +21,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/share/man/man4/dpt.4,v 1.14 2003/03/02 22:56:04 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/dpt.4,v 1.15 2003/05/20 22:07:30 ru Exp $ .\" .Dd October 16, 1998 .Dt DPT 4 @@ -44,7 +44,8 @@ The .Nm driver provides support for the following RAID adapters: -.Bl -bullet +.Pp +.Bl -bullet -compact .It DPT Smart Cache Plus .It @@ -57,8 +58,8 @@ Smart RAID III (PM3?3?, PM3332 [EISA], PM3334UW [PCI]) (Gen3) .It Smart Cache IV (PM2?4?, PM2042 [EISA], PM2044/PM2144 [PCI]) (Gen4) +.El .Pp -.El SmartRAID (PM3???) are "Enterprise" class cards, and SmartCache (PM2???) cards are in the "Workstation" class. The Gen 4 Smart Cache IV products were a re-issue of the Gen 3 utilizing ==== //depot/projects/hammer/share/man/man4/em.4#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" Copyright (c) 2001-2003, Intel Corporation .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions are met: .\" @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/em.4,v 1.12 2003/01/24 21:28:20 pdeuskar Exp $ +.\" $FreeBSD: src/share/man/man4/em.4,v 1.13 2003/05/21 15:55:40 ru Exp $ .\" .Dd July 26, 2002 .Dt EM 4 ==== //depot/projects/hammer/share/man/man4/geom.4#4 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom.4,v 1.8 2003/05/05 17:36:57 phk Exp $ +.\" $FreeBSD: src/share/man/man4/geom.4,v 1.9 2003/05/21 15:55:40 ru Exp $ .\" .Dd March 27, 2002 .Os @@ -175,7 +175,7 @@ .Pp When a provider is orphaned, this does not necessarily result in any immediate change in the topology: any attached consumers are still -attached, any opened paths are still open, any outstanding I/O +attached, any opened paths are still open, any outstanding I/O requests are still outstanding. .Pp The typical scenario is @@ -183,7 +183,7 @@ .It A device driver detects a disk has departed and orphans the provider for it. .It -The geoms on top of the disk receive the orphanization event and +The geoms on top of the disk receive the orphanization event and orphans all their providers in turn. Providers, which are not attached to, will typically self-destruct right away. ==== //depot/projects/hammer/share/man/man4/ip.4#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.32 2003/04/29 21:36:18 mdodd Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.33 2003/05/20 22:07:55 ru Exp $ .\" .Dd March 3, 2001 .Dt IP 4 @@ -125,11 +125,19 @@ address for a .Tn UDP datagram. -The msg_control field in the msghdr structure points to a buffer -that contains a cmsghdr structure followed by the +The +.Vt msg_control +field in the +.Vt msghdr +structure points to a buffer +that contains a +.Vt cmsghdr +structure followed by the .Tn IP address. -The cmsghdr fields have the following values: +The +.Vt cmsghdr +fields have the following values: .Bd -literal cmsg_len = sizeof(struct in_addr) cmsg_level = IPPROTO_IP @@ -143,7 +151,9 @@ address can be specified as ancillary data with a type code of .Dv IP_SENDSRCADDR . The msg_control field in the msghdr structure should point to a buffer -that contains a cmsghdr structure followed by the +that contains a +.Vt cmsghdr +structure followed by the .Tn IP address. The cmsghdr fields should have the following values: @@ -177,7 +187,7 @@ .Tn UDP datagram. The msg_control field in the msghdr structure points to a buffer -that contains a cmsghdr structure followed by the +that contains a cmsghdr structure followed by the .Tn TTL . The cmsghdr fields have the following values: .Bd -literal @@ -186,16 +196,27 @@ cmsg_type = IP_RECVTTL .Ed .Pp -If the -.Dv IP_RECVIF -option is enabled on a +If the +.Dv IP_RECVIF +option is enabled on a .Dv SOCK_DGRAM -socket, the -.Xr recvmsg 2 -call returns a struct sockaddr_dl corresponding to the interface on which the -packet was received. The msg_control field in the msghdr structure points -to a buffer that contains a cmsghdr structure followed by the -struct sockaddr_dl. The cmsghdr fields have the following values: +socket, the +.Xr recvmsg 2 +call returns a +.Vt "struct sockaddr_dl" +corresponding to the interface on which the +packet was received. +The +.Va msg_control +field in the +.Vt msghdr +structure points to a buffer that contains a +.Vt cmsghdr +structure followed by the +.Vt "struct sockaddr_dl" . +The +.Vt cmsghdr +fields have the following values: .Bd -literal cmsg_len = sizeof(struct sockaddr_dl) cmsg_level = IPPROTO_IP @@ -230,7 +251,8 @@ use a low range of ports, which are normally restricted to privileged processes on .Ux -systems. The range is normally from +systems. +The range is normally from .Dv IPPORT_RESERVED \- 1 down to .Li IPPORT_RESERVEDSTART @@ -287,7 +309,8 @@ Multicast datagrams with a TTL of 0 will not be transmitted on any network, but may be delivered locally if the sending host belongs to the destination group and if multicast loopback has not been disabled on the sending socket -(see below). Multicast datagrams with TTL greater than 1 may be forwarded +(see below). +Multicast datagrams with TTL greater than 1 may be forwarded to other networks if a multicast router is attached to the local network. .Pp For hosts with multiple interfaces, each multicast transmission is @@ -329,18 +352,20 @@ This option improves performance for applications that may have no more than one instance on a single host (such as a router daemon), by eliminating -the overhead of receiving their own transmissions. It should generally not +the overhead of receiving their own transmissions. +It should generally not be used by applications for which there may be more than one instance on a single host (such as a conferencing program) or for which the sender does not belong to the destination group (such as a time querying program). .Pp A multicast datagram sent with an initial TTL greater than 1 may be delivered to the sending host on a different interface from that on which it was sent, -if the host belongs to the destination group on that other interface. The -loopback control option has no effect on such delivery. +if the host belongs to the destination group on that other interface. +The loopback control option has no effect on such delivery. .Pp A host must become a member of a multicast group before it can receive -datagrams sent to the group. To join a multicast group, use the +datagrams sent to the group. +To join a multicast group, use the .Dv IP_ADD_MEMBERSHIP option: .Bd -literal @@ -487,7 +512,7 @@ may occur when setting or getting .Tn IP options: -.Bl -tag -width EADDRNOTAVAILxx +.Bl -tag -width Er .It Bq Er EINVAL An unknown socket option name was given. .It Bq Er EINVAL ==== //depot/projects/hammer/share/man/man4/mac.4#3 (text+ko) ==== @@ -1,12 +1,12 @@ .\" Copyright (c) 2003 Networks Associates Technology, Inc. .\" All rights reserved. -.\" +.\" .\" This software was developed for the FreeBSD Project by Chris Costello .\" at Safeport Network Services and Network Associates Labs, the .\" Security Research Division of Network Associates, Inc. under .\" DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the .\" DARPA CHATS research program. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -15,7 +15,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -27,8 +27,8 @@ .\" 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/share/man/man4/mac.4,v 1.9 2003/03/31 08:08:59 chris Exp $ +.\" +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.10 2003/05/21 15:55:40 ru Exp $ .Dd JANUARY 8, 2003 .Os .Dt MAC 4 @@ -285,8 +285,8 @@ The TrustedBSD MAC Framework is considered experimental in .Fx . .Pp -While the MAC Framework design is intended to support the containment of -the root user, not all attack channels are currently protected by entry +While the MAC Framework design is intended to support the containment of +the root user, not all attack channels are currently protected by entry point checks. As such, MAC Framework policies should not be relied on, in isolation, to protect against a malicious privileged user. ==== //depot/projects/hammer/share/man/man4/mac_bsdextended.4#3 (text+ko) ==== @@ -1,12 +1,12 @@ .\" Copyright (c) 2002 Networks Associates Technology, Inc. .\" All rights reserved. -.\" +.\" .\" This software was developed for the FreeBSD Project by Chris Costello .\" at Safeport Network Services and Network Associates Laboratories, the .\" Security Research Division of Network Associates, Inc. under >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 21 12:26:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 660AE37B404; Wed, 21 May 2003 12:26: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 00B2D37B401 for ; Wed, 21 May 2003 12:26:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BEB943F3F for ; Wed, 21 May 2003 12:26:27 -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 h4LJQR0U049455 for ; Wed, 21 May 2003 12:26:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4LJQRhc049452 for perforce@freebsd.org; Wed, 21 May 2003 12:26:27 -0700 (PDT) Date: Wed, 21 May 2003 12:26:27 -0700 (PDT) Message-Id: <200305211926.h4LJQRhc049452@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 31578 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, 21 May 2003 19:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=31578 Change 31578 by peter@peter_daintree on 2003/05/21 12:26:25 IFC @31577 Affected files ... .. //depot/projects/hammer/share/man/man9/Makefile#11 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#9 integrate Differences ... ==== //depot/projects/hammer/share/man/man9/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.190 2003/05/16 19:22:27 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.191 2003/05/21 17:37:22 ru Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \ @@ -127,6 +127,18 @@ MLINKS+=byteorder.9 le16toh.9 MLINKS+=byteorder.9 le32toh.9 MLINKS+=byteorder.9 le64toh.9 +MLINKS+=byteorder.9 be16enc.9 +MLINKS+=byteorder.9 be16dec.9 +MLINKS+=byteorder.9 be32enc.9 +MLINKS+=byteorder.9 be32dec.9 +MLINKS+=byteorder.9 be64enc.9 +MLINKS+=byteorder.9 be64dec.9 +MLINKS+=byteorder.9 le16enc.9 +MLINKS+=byteorder.9 le16dec.9 +MLINKS+=byteorder.9 le32enc.9 +MLINKS+=byteorder.9 le32dec.9 +MLINKS+=byteorder.9 le64enc.9 +MLINKS+=byteorder.9 le64dec.9 MLINKS+=condvar.9 cv_init.9 MLINKS+=condvar.9 cv_destroy.9 MLINKS+=condvar.9 cv_wait.9 ==== //depot/projects/hammer/sys/geom/geom_disk.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_disk.c,v 1.70 2003/05/12 20:15:28 phk Exp $ + * $FreeBSD: src/sys/geom/geom_disk.c,v 1.71 2003/05/21 18:52:29 phk Exp $ */ #include "opt_geom.h" @@ -104,6 +104,8 @@ w += pp->acw; e += pp->ace; dp = pp->geom->softc; + if (dp == NULL) + return (ENXIO); error = 0; if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) { if (dp->d_open != NULL) { @@ -193,6 +195,8 @@ off_t off; dp = bp->bio_to->geom->softc; + if (dp == NULL) + g_io_deliver(bp, ENXIO); error = EJUSTRETURN; switch(bp->bio_cmd) { case BIO_DELETE: ==== //depot/projects/hammer/sys/kern/kern_switch.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.57 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.58 2003/05/21 18:53:25 julian Exp $ */ /*** @@ -162,12 +162,15 @@ ke->ke_flags |= KEF_DIDRUN; /* - * Only allow non system threads to run in panic - * if they are the one we are tracing. (I think.. [JRE]) + * If we are in panic, only allow system threads, + * plus the one we are running in, to be run. */ if (panicstr && ((td->td_proc->p_flag & P_SYSTEM) == 0 && - (td->td_flags & TDF_INPANIC) == 0)) + (td->td_flags & TDF_INPANIC) == 0)) { + /* note that it is no longer on the run queue */ + TD_SET_CAN_RUN(td); goto retry; + } TD_SET_RUNNING(td); return (td); From owner-p4-projects@FreeBSD.ORG Wed May 21 13:43:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81B4937B405; Wed, 21 May 2003 13:43:01 -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 31C8537B404 for ; Wed, 21 May 2003 13:43:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDDEC43F85 for ; Wed, 21 May 2003 13:43:00 -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 h4LKh00U058292 for ; Wed, 21 May 2003 13:43:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4LKh04n058280 for perforce@freebsd.org; Wed, 21 May 2003 13:43:00 -0700 (PDT) Date: Wed, 21 May 2003 13:43:00 -0700 (PDT) Message-Id: <200305212043.h4LKh04n058280@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 31580 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, 21 May 2003 20:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=31580 Change 31580 by peter@peter_hammer on 2003/05/21 13:42:45 Whoops. 64 bit memory addresses do not fit too well in an int. Affected files ... .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#3 (text+ko) ==== @@ -401,7 +401,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ @@ -443,7 +443,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ @@ -485,7 +485,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ @@ -741,7 +741,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ @@ -783,7 +783,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ @@ -825,7 +825,7 @@ else #endif { - int _port_ = bsh + offset; + bus_space_handle_t _port_ = bsh + offset; #ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ From owner-p4-projects@FreeBSD.ORG Wed May 21 13:44:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9725E37B404; Wed, 21 May 2003 13:44: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 4BC4937B401 for ; Wed, 21 May 2003 13:44:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6ADB43F85 for ; Wed, 21 May 2003 13:44:02 -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 h4LKi20U058382 for ; Wed, 21 May 2003 13:44:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4LKi2dl058379 for perforce@freebsd.org; Wed, 21 May 2003 13:44:02 -0700 (PDT) Date: Wed, 21 May 2003 13:44:02 -0700 (PDT) Message-Id: <200305212044.h4LKi2dl058379@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 31581 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, 21 May 2003 20:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=31581 Change 31581 by peter@peter_hammer on 2003/05/21 13:43:46 Allow for the possibility of mapping > 4GB Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#7 (text+ko) ==== @@ -355,8 +355,8 @@ */ vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r)); } else { - u_int32_t paddr; - u_int32_t psize; + u_int64_t paddr; + u_int64_t psize; u_int32_t poffs; paddr = rman_get_start(r); From owner-p4-projects@FreeBSD.ORG Thu May 22 00:56:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BB3A37B404; Thu, 22 May 2003 00:56: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 11DBB37B401 for ; Thu, 22 May 2003 00:56:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8696F43F85 for ; Thu, 22 May 2003 00:56:01 -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 h4M7u10U011720 for ; Thu, 22 May 2003 00:56:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4M7u072011717 for perforce@freebsd.org; Thu, 22 May 2003 00:56:00 -0700 (PDT) Date: Thu, 22 May 2003 00:56:00 -0700 (PDT) Message-Id: <200305220756.h4M7u072011717@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 31618 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, 22 May 2003 07:56:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=31618 Change 31618 by peter@peter_daintree on 2003/05/22 00:55:12 IFC @31614 Affected files ... .. //depot/projects/hammer/Makefile.inc1#17 integrate .. //depot/projects/hammer/release/Makefile#22 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#11 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#9 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.1#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#4 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#4 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.362 2003/05/21 21:47:20 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -695,7 +695,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_KERBEROS) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +782,8 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && !defined(NO_KERBEROS) +.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/hammer/release/Makefile#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.778 2003/05/20 01:46:09 scottl Exp $ +# $FreeBSD: src/release/Makefile,v 1.779 2003/05/21 21:19:54 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] ==== //depot/projects/hammer/share/examples/etc/make.conf#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.215 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.216 2003/05/21 21:47:20 ru Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -113,7 +113,8 @@ #NO_MODULES= true # do not build modules with the kernel #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH -#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) +#NO_OPENSSL= true # do not build OpenSSL (implies NO_KERBEROS and +# NO_OPENSSH) #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_TCSH= true # do not build and install /bin/csh (which is tcsh) ==== //depot/projects/hammer/share/man/man5/make.conf.5#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.73 2003/05/19 15:51:59 des Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.74 2003/05/21 21:47:20 ru Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -481,6 +481,8 @@ .It Va NO_OPENSSL .Pq Vt bool Set to not build OpenSSL (implies +.Va NO_KERBEROS +and .Va NO_OPENSSH ) . .It Va NO_SENDMAIL .Pq Vt bool ==== //depot/projects/hammer/usr.bin/ipcs/ipcs.1#3 (text+ko) ==== @@ -27,7 +27,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/usr.bin/ipcs/ipcs.1,v 1.15 2003/03/24 10:45:12 tjr Exp $ +.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.16 2003/05/21 21:07:28 ru Exp $ .\" .Dd June 18, 1994 .Dt "IPCS" 1 @@ -100,7 +100,7 @@ .It Fl C Ar core Extract values associated with the name list from the specified core instead of the default -.Dq Pa /dev/kmem . +.Pa /dev/kmem . Implies .Fl y . .It Fl M @@ -108,7 +108,7 @@ .It Fl N Ar system Extract the name list from the specified system instead of the default -.Dq Pa /boot/kernel/kernel . +.Pa /boot/kernel/kernel . Implies .Fl y . .It Fl Q ==== //depot/projects/hammer/usr.bin/mt/mt.1#4 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.36 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.37 2003/05/21 21:07:28 ru Exp $ .\" .Dd June 6, 1993 .Dt MT 1 @@ -352,7 +352,9 @@ .Xr st 4 driver appeared in .Bx 386 0.1 -as a separate st(1) command, and have been merged into the +as a separate +.Nm st +command, and have been merged into the .Nm command in .Fx 2.1 . ==== //depot/projects/hammer/usr.bin/netstat/netstat.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 -.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.43 2003/03/26 02:00:35 keramida Exp $ +.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.44 2003/05/21 20:52:57 ru Exp $ .\" .Dd September 7, 2001 .Dt NETSTAT 1 @@ -49,7 +49,7 @@ .It Xo .Bk -words .Nm -.Op Fl AaLlnSW +.Op Fl AaLnSW .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system @@ -189,7 +189,7 @@ .Bk -words .Nm .Fl r -.Op Fl AalnW +.Op Fl AanW .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -213,8 +213,6 @@ normally these routes are not shown. When .Fl W -or -.Fl l is also present, show the path MTU for each route. @@ -235,7 +233,7 @@ .Bk -words .Nm .Fl g -.Op Fl lW +.Op Fl W .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -295,11 +293,6 @@ The program will complain if .Ar protocol is unknown or if there is no statistics routine for it. -.It Fl l -The -.Fl l -option is equivalent to -.Fl W . .It Fl M Extract values associated with the name list from the specified core instead of the default ==== //depot/projects/hammer/usr.bin/stat/stat.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.4 2003/05/11 23:07:07 dougb Exp $ +.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.5 2003/05/21 21:07:28 ru Exp $ .\" .Dd May 8, 2003 .Dt STAT 1 @@ -119,8 +119,9 @@ error messages are automatically suppressed. .It Fl f Ar format Display information using the specified format. -See the FORMATS section -for a description of valid formats. +See the +.Sx FORMATS +section for a description of valid formats. .It Fl l Display output in .Ic ls Fl lT ==== //depot/projects/hammer/usr.bin/xargs/xargs.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)xargs.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.29 2003/03/23 18:29:52 mux Exp $ +.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.30 2003/05/21 21:07:28 ru Exp $ .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $ .\" .Dd May 7, 2001 @@ -194,7 +194,7 @@ is 5000. .It Fl o Reopen stdin as -.Dq /dev/tty +.Pa /dev/tty in the child process before executing the command. This is useful if you want .Nm From owner-p4-projects@FreeBSD.ORG Thu May 22 10:36:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67F3437B404; Thu, 22 May 2003 10:36:45 -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 11F8137B401 for ; Thu, 22 May 2003 10:36:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AEDD43F93 for ; Thu, 22 May 2003 10:36:44 -0700 (PDT) (envelope-from obrien@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 h4MHai0U055227 for ; Thu, 22 May 2003 10:36:44 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4MHah38055224 for perforce@freebsd.org; Thu, 22 May 2003 10:36:43 -0700 (PDT) Date: Thu, 22 May 2003 10:36:43 -0700 (PDT) Message-Id: <200305221736.h4MHah38055224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 31626 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, 22 May 2003 17:36:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=31626 Change 31626 by obrien@obrien_trang on 2003/05/22 10:36:33 Fix typo in #20 change 31518. Affected files ... .. //depot/projects/hammer/release/Makefile#23 edit Differences ... ==== //depot/projects/hammer/release/Makefile#23 (text+ko) ==== @@ -244,7 +244,7 @@ CD= ${_R}/cdrom CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 -_MK= ${CHROOT}/mk +_MK= ${CHROOTDIR}/mk # Where the bootstrap ports (see DOCPORTS) get installed. LOCALDIR= /usr/local/bin From owner-p4-projects@FreeBSD.ORG Thu May 22 13:12:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B73837B404; Thu, 22 May 2003 13:12:01 -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 D4E1437B401 for ; Thu, 22 May 2003 13:12:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B18F243F75 for ; Thu, 22 May 2003 13:11:59 -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 h4MKBx0U069849 for ; Thu, 22 May 2003 13:11:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4MKBxlB069846 for perforce@freebsd.org; Thu, 22 May 2003 13:11:59 -0700 (PDT) Date: Thu, 22 May 2003 13:11:59 -0700 (PDT) Message-Id: <200305222011.h4MKBxlB069846@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 31637 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, 22 May 2003 20:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=31637 Change 31637 by peter@peter_daintree on 2003/05/22 13:11:48 IFC @31636 Affected files ... .. //depot/projects/hammer/lib/libc/gen/arc4random.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getfsent.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.3#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#5 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcstod.3#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.3#5 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/fputws.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtod.3#5 integrate .. //depot/projects/hammer/lib/libc/sys/jail.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#4 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.3#4 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#4 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.3#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#20 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#9 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/hammer/sys/sys/stat.h#6 integrate .. //depot/projects/hammer/usr.bin/uuidgen/uuidgen.1#4 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.8#5 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#6 integrate .. //depot/projects/hammer/usr.sbin/chown/chgrp.1#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.8#3 integrate .. //depot/projects/hammer/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#9 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#6 integrate Differences ... ==== //depot/projects/hammer/lib/libc/gen/arc4random.3#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" Manual page, using -mandoc macros -.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.14 2003/05/01 20:27:59 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.15 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 15, 1997 .Dt ARC4RANDOM 3 @@ -57,7 +57,8 @@ can be in about .if t 2\u\s71700\s10\d .if n (2**1700) -states. The +states. +The .Fn arc4random function returns pseudo-random numbers in the range of 0 to .if t 2\u\s731\s10\d\(mi1, @@ -87,7 +88,7 @@ functions using .Fn arc4random : .Pp -.Dl #define foo4random() (arc4random() % ((unsigned)RAND_MAX + 1)) +.Dl "#define foo4random() (arc4random() % ((unsigned)RAND_MAX + 1))" .Sh SEE ALSO .Xr rand 3 , .Xr random 3 , ==== //depot/projects/hammer/lib/libc/gen/getfsent.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.14 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 7, 2003 .Dt GETFSENT 3 @@ -46,11 +46,11 @@ .Lb libc .Sh SYNOPSIS .In fstab.h -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsent void -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsspec "const char *spec" -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsfile "const char *file" .Ft int .Fn setfsent void @@ -58,7 +58,7 @@ .Fn endfsent void .Ft void .Fn setfstab "const char *file" -.Ft const char * +.Ft "const char *" .Fn getfstab void .Sh DESCRIPTION The @@ -103,11 +103,11 @@ The value set by .Fn setfstab does not persist across calls to -.Fn endfsent +.Fn endfsent . .Pp The .Fn getfstab -function returns the name of the file that that will be used. +function returns the name of the file that will be used. .Pp The .Fn getfsspec @@ -145,17 +145,17 @@ function returns nothing. .Sh ENVIRONMENT -.Bl -tag -width PATH_FSTAB -.It Pa PATH_FSTAB +.Bl -tag -width ".Ev PATH_FSTAB" +.It Ev PATH_FSTAB If the environment variable -.Pa PATH_FSTAB -is set all operations are performed against the specified file. -.Pa PATH_FSTAB +.Ev PATH_FSTAB +is set, all operations are performed against the specified file. +.Ev PATH_FSTAB will not be honored if the process environment or memory address space is considred .Dq tainted . (See -.Fn issetugid +.Xr issetugid 2 for more information.) .El .Sh FILES ==== //depot/projects/hammer/lib/libc/gen/getpwent.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getpwent.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.22 2003/04/17 14:15:26 nectar Exp $ +.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.23 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 16, 2003 .Dt GETPWENT 3 @@ -194,7 +194,8 @@ and .Fn getpwuid_r return 0 if no error occurred, or an error number to indicate failure. -It is not an error if a matching entry is not found. (Thus, if +It is not an error if a matching entry is not found. +(Thus, if .Fa result is .Dv NULL ==== //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.15 2003/05/22 13:02:27 ru Exp $ .\" .Dd July 27, 1998 .Os @@ -75,13 +75,14 @@ .Fa int_map argument is a bitmap which determines whether vm86 interrupts should be handled -in vm86 mode, or reflected back to the process. If the +in vm86 mode, or reflected back to the process. +If the .Em Nth bit is set, the interrupt will be reflected to the process, otherwise it will be dispatched by the vm86 interrupt table. .It Dv VM86_INTCALL -This allows calls to be made to vm86 interrupt handlers by the process. It -effectively simulates an INT instruction. +This allows calls to be made to vm86 interrupt handlers by the process. +It effectively simulates an INT instruction. .Fa data should point to the following structure: .Bd -literal @@ -92,8 +93,8 @@ .Ed .Pp .Fa intnum -specifies the operand of INT for the simulated call. A value of 0x10, for -example, would often be used to call into the VGA BIOS. +specifies the operand of INT for the simulated call. +A value of 0x10, for example, would often be used to call into the VGA BIOS. .Fa vmf is used to initialize CPU registers according to the calling convention for the interrupt handler. @@ -117,7 +118,8 @@ .Xr sigreturn 2 with the correct machine context for vm86, and with the .Dv PSL_VM -bit set. Control returns to the process upon delivery of a signal. +bit set. +Control returns to the process upon delivery of a signal. .Sh RETURN VALUES .Rv -std i386_vm86 .Sh ERRORS @@ -132,6 +134,7 @@ There is not enough memory to initialize the kernel data structures. .El .Sh AUTHORS +.An -nosplit This man page was written by .An Jonathan Lemon , and updated by ==== //depot/projects/hammer/lib/libc/locale/setlocale.3#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setlocale.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.26 2003/03/20 08:13:34 ache Exp $ +.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.27 2003/05/22 13:02:27 ru Exp $ .\" .Dd October 5, 2002 .Dt SETLOCALE 3 @@ -177,7 +177,7 @@ .Bl -tag -width mon_decimal_point .It Fa decimal_point The decimal point character, except for currency values, -can't be the empty string. +cannot be an empty string. .It Fa thousands_sep The separator between groups of digits before the decimal point, except for currency values. ==== //depot/projects/hammer/lib/libc/locale/wcstod.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.3 2003/03/13 06:29:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $ .\" .Dd February 22, 2003 .Dt WCSTOD 3 @@ -31,14 +31,17 @@ .Nm wcstof , .Nm wcstod , .Nm wcstold -.Nd "convert string to float, double or long double" +.Nd convert string to +.Vt float , double +or +.Vt "long double" .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In wchar.h .Ft float .Fn wcstof "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" -.Ft long double +.Ft "long double" .Fn wcstold "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" .Ft double .Fn wcstod "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" @@ -53,13 +56,13 @@ .Fn strtod and .Fn strtold -functios. +functions. Refer to .Xr strtod 3 for details. .Sh SEE ALSO .Xr strtod 3 , -.Xr wcstol 3 , +.Xr wcstol 3 .Sh STANDARDS The .Fn wcstof , ==== //depot/projects/hammer/lib/libc/net/nsdispatch.3#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.11 2003/05/22 13:02:27 ru Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -74,7 +74,8 @@ .Pp Each method has the function signature described by the typedef: .Pp -.Ft typedef "int \*(lp*nss_method\*(rp\*(lpvoid *retval, void *mdata, va_list *ap\*(rp" ; +.Ft typedef int +.Fn \*(lp*nss_method\*(rp "void *retval" "void *mdata" "va_list *ap" ; .Pp .Va dtab is an array of @@ -175,12 +176,12 @@ .Ss Valid source types While there is support for arbitrary sources, the following #defines for commonly implemented sources are available: -.Bl -column NS_COMPAT COMPAT -offset indent +.Bl -column NSSRC_COMPAT compat -offset indent .It Sy "#define value" -.It "NSSRC_FILES ""files""" -.It "NSSRC_DNS ""dns""" -.It "NSSRC_NIS ""nis""" -.It "NSSRC_COMPAT ""compat""" +.It Dv NSSRC_FILES Ta """files"" +.It Dv NSSRC_DNS Ta """dns"" +.It Dv NSSRC_NIS Ta """nis"" +.It Dv NSSRC_COMPAT Ta """compat"" .El .Pp Refer to @@ -192,13 +193,13 @@ .Vt nss_method functions must return one of the following values depending upon status of the lookup: -.Bl -column "RETURN VALUE" "STATUS CODE" +.Bl -column "Return value" "Status code" .It Sy "Return value Status code" -.It "NS_SUCCESS success" -.It "NS_NOTFOUND notfound" -.It "NS_UNAVAIL unavail" -.It "NS_TRYAGAIN tryagain" -.It "NS_RETURN -none-" +.It Dv NS_SUCCESS Ta success +.It Dv NS_NOTFOUND Ta notfound +.It Dv NS_UNAVAIL Ta unavail +.It Dv NS_TRYAGAIN Ta tryagain +.It Dv NS_RETURN Ta -none- .El .Pp Refer to @@ -208,12 +209,14 @@ The .Fn nsdispatch function returns the value of the method that caused the dispatcher to -terminate, or NS_NOTFOUND otherwise. +terminate, or +.Dv NS_NOTFOUND +otherwise. .Sh SEE ALSO .Xr hesiod 3 , .Xr stdarg 3 , -.Xr yp 8 , -.Xr nsswitch.conf 5 +.Xr nsswitch.conf 5 , +.Xr yp 8 .Sh HISTORY The .Fn nsdispatch @@ -232,10 +235,10 @@ wrote this freely-distributable name-service switch implementation, using ideas from the .Tn ULTRIX -"svc.conf\*(lp5\*(rp" +svc.conf(5) and .Tn Solaris -"nsswitch.conf\*(lp4\*(rp" +nsswitch.conf(4) manual pages. The .Fx ==== //depot/projects/hammer/lib/libc/posix1e/mac.3#6 (text+ko) ==== @@ -28,14 +28,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.12 2003/04/20 04:43:56 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.13 2003/05/22 13:02:27 ru Exp $ .\" .Dd April 19, 2003 .Dt MAC 3 .Os .Sh NAME .Nm mac -.Nd Introduction to the MAC security API +.Nd introduction to the MAC security API .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/hammer/lib/libc/stdio/fputws.3#3 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 .\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp -.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.4 2003/03/09 02:56:54 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.5 2003/05/22 13:02:27 ru Exp $ .\" .Dd August 6, 2002 .Dt FPUTWS 3 @@ -63,10 +63,10 @@ function returns 0 on success and \-1 on error. .Sh ERRORS -.Bl -tag -width Er The .Fn fputws function will fail if: +.Bl -tag -width Er .It Bq Er EBADF The .Fa fp ==== //depot/projects/hammer/lib/libc/stdlib/strtod.3#5 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strtod.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.18 2003/03/12 20:31:05 das Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.19 2003/05/22 13:02:28 ru Exp $ .\" .Dd March 2, 2003 .Dt STRTOD 3 @@ -52,7 +52,7 @@ .Fn strtod "const char * restrict nptr" "char ** restrict endptr" .Ft float .Fn strtof "const char * restrict nptr" "char ** restrict endptr" -.Ft long double +.Ft "long double" .Fn strtold "const char * restrict nptr" "char ** restrict endptr" .Sh DESCRIPTION These conversion @@ -63,7 +63,7 @@ .Vt double , .Vt float , and -.Vt long double +.Vt "long double" representation, respectively. .Pp The expected form of the string is an optional plus (``+'') or minus @@ -160,10 +160,10 @@ The author of this software is .An David M. Gay . .Pp +.Bd -literal Copyright (c) 1998 by Lucent Technologies -.br All Rights Reserved -.Pp + Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all @@ -173,7 +173,7 @@ not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. -.Pp + LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY @@ -182,3 +182,4 @@ IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.Ed ==== //depot/projects/hammer/lib/libc/sys/jail.2#4 (text+ko) ==== @@ -6,13 +6,13 @@ .\"this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\"---------------------------------------------------------------------------- .\" -.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.23 2003/04/09 02:55:17 mike Exp $ +.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.24 2003/05/22 13:02:28 ru Exp $ .\" .Dd April 8, 2003 .Dt JAIL 2 .Os .Sh NAME -.Nm jail +.Nm jail , jail_attach .Nd imprison current process and future decendants .Sh LIBRARY .Lb libc @@ -59,21 +59,16 @@ .Fn jail_attach system call attaches the current process to an existing jail, identified by -.Va jid . +.Fa jid . .Sh RETURN VALUES If successful, .Fn jail returns a non-negative integer, termed the jail identifier (JID). -It returns -1 on failure, and sets +It returns \-1 on failure, and sets .Va errno to indicate the error. .Pp -If successful, -.Fn jail_attach -returns 0. -It returns -1 on failure, and sets -.Va errno -to indicate the error. +.Rv -std jail_attach .Sh PRISON? Once a process has been put in a prison, it and its decendants cannot escape the prison. ==== //depot/projects/hammer/lib/libc/sys/sendfile.2#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/lib/libc/sys/sendfile.2,v 1.17 2003/03/12 09:28:44 seanc Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.18 2003/05/22 13:02:28 ru Exp $ .\" .Dd November 5, 1998 .Dt SENDFILE 2 @@ -107,22 +107,22 @@ .Fn sendfile is "zero-copy", meaning that it has been optimized so that copying of the file data is avoided. .Sh TUNING -Internally this system call uses a special +Internally, this system call uses a special .Xr sendfile 2 buffer -.Pq Fa "struct sf_buf" +.Pq Vt "struct sf_buf" to handle sending file data to the client. If the sending socket is -blocking and there are not enough sendfile buffers available, +blocking, and there are not enough sendfile buffers available, .Xr sendfile 2 will block and report a state of -.Dq sfbufa . +.Dq Li sfbufa . If the sending socket is non-blocking and there are not enough sendfile buffers available, the call will block and wait for the necessary buffers to become available before finishing the call. .Pp The number of -.Fa sf_buf Ns 's +.Vt sf_buf Ns 's allocated should be proportional to the number of nmbclusters used to send data to a client via .Xr sendfile 2 . @@ -130,19 +130,21 @@ Busy installations that make extensive use of .Xr sendfile 2 may want to increase these values to be inline with their -.Ar kern.ipc.nmbclusters -.Pq see Xr tuning 7 for details . +.Va kern.ipc.nmbclusters +(see +.Xr tuning 7 +for details). .Pp The number of .Xr sendfile 2 buffers in use is determined at boot time by either the -.Em kern.ipc.nsfbufs +.Va kern.ipc.nsfbufs .Xr loader.conf 5 variable or the -.Em NSFBUFS +.Dv NSFBUFS kernel configuration tunable. The number of sendfile buffers scales with -.Em kern.maxusers . +.Va kern.maxusers . .Sh RETURN VALUES .Rv -std sendfile .Sh ERRORS @@ -198,8 +200,8 @@ .Xr open 2 , .Xr send 2 , .Xr socket 2 , -.Xr tuning 7 , -.Xr writev 2 +.Xr writev 2 , +.Xr tuning 7 .Sh HISTORY The .Fn sendfile ==== //depot/projects/hammer/lib/libc/sys/stat.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 -.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.32 2003/05/13 08:10:05 dougb Exp $ +.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.33 2003/05/22 13:02:28 ru Exp $ .\" .Dd February 15, 2002 .Dt STAT 2 @@ -90,8 +90,8 @@ The time-related fields of .Fa struct stat are as follows: -.Bl -tag -width XXXst_mtime -.It st_atime +.Bl -tag -width ".Va st_birthtime" +.It Va st_atime Time when file data last accessed. Changed by the .Xr mknod 2 , @@ -99,7 +99,7 @@ and .Xr read 2 system calls. -.It st_mtime +.It Va st_mtime Time when file data last modified. Changed by the .Xr mknod 2 , @@ -107,7 +107,7 @@ and .Xr write 2 system calls. -.It st_ctime +.It Va st_ctime Time when file status was last changed (inode data modification). Changed by the .Xr chmod 2 , @@ -120,7 +120,7 @@ and .Xr write 2 system calls. -.It st_birthtime +.It Va st_birthtime Time when the inode was created. .El .Pp ==== //depot/projects/hammer/lib/libdevstat/devstat.3#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.22 2003/03/18 13:45:08 phk Exp $ +.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.23 2003/05/22 13:02:28 ru Exp $ .\" .Dd July 15, 2001 .Dt DEVSTAT 3 @@ -40,7 +40,7 @@ .Nm devstat_selectdevs , .Nm devstat_buildmatch , .Nm devstat_compute_statistics , -.Nm devstat_compute_etime , +.Nm devstat_compute_etime .Nd device statistics utility library .Sh LIBRARY .Lb libdevstat @@ -553,7 +553,7 @@ .It DSM_MB_PER_SECOND_FREE type: long double * .Pp -The average number of megabytesper second in the specified type of +The average number of megabytes per second in the specified type of transaction between the acquisition of .Va previous and @@ -600,7 +600,7 @@ and .Va current . .It DSM_BUSY_PCT -type long double * +type: long double * .Pp The percentage of time the device had one or more transactions outstanding between the acquisition of ==== //depot/projects/hammer/lib/libfetch/fetch.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.52 2003/03/03 12:35:03 des Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.53 2003/05/22 13:02:28 ru Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 @@ -444,7 +444,7 @@ The accompanying error message includes a protocol-specific error code and message, e.g. "File is not available (404 Not Found)" .Sh ENVIRONMENT -.Bl -tag -width FETCH_BIND_ADDRESS +.Bl -tag -width ".Ev FETCH_BIND_ADDRESS" .It Ev FETCH_BIND_ADDRESS Specifies a hostname or IP address to which sockets used for outgoing connections will be bound. ==== //depot/projects/hammer/lib/libusbhid/usbhid.3#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/lib/libusbhid/usbhid.3,v 1.13 2003/04/09 01:52:48 mdodd Exp $ +.\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.14 2003/05/22 13:02:28 ru Exp $ .\" .Dd December 29, 2001 .Dt USBHID 3 @@ -65,13 +65,13 @@ .Fn hid_report_size "report_desc_t d" "hid_kind_t k" "int id" .Ft int .Fn hid_locate "report_desc_t d" "u_int usage" "hid_kind_t k" "hid_item_t *h" "int id" -.Ft char * +.Ft "char *" .Fn hid_usage_page "int i" -.Ft char * +.Ft "char *" .Fn hid_usage_in_page "u_int u" .Ft int .Fn hid_parse_usage_page "const char *" -.Ft char * +.Ft "char *" .Fn hid_parse_usage_in_page "const char *" .Ft void .Fn hid_init "char *file" @@ -83,7 +83,7 @@ The .Nm library provides routines to extract data from USB Human Interface Devices. -.Ss INTRODUCTION +.Ss Introduction USB HID devices send and receive data layed out in a device dependent way. The .Nm @@ -94,7 +94,7 @@ The routines can be divided into four parts: extraction of the descriptor, parsing of the descriptor, translating to/from symbolic names, and data manipulation. -.Ss DESCRIPTOR FUNCTIONS +.Ss Descriptor Functions A report descriptor can be obtained by calling .Fn hid_get_report_desc with a file descriptor obtained by opening a @@ -114,7 +114,7 @@ .Fn hid_dispose_report_desc fails it will return .Dv NULL . -.Ss DESCRIPTOR PARSING FUNCTIONS +.Ss Descriptor Parsing Functions To parse the report descriptor the .Fn hid_start_parse function should be called with a report descriptor and a set that @@ -125,7 +125,7 @@ .Fa k is an item of type .Vt hid_kind_t . -The report id (if present) is given by +The report ID (if present) is given by .Fa id . The function returns .Dv NULL @@ -164,7 +164,7 @@ It should be given the usage code of the item and its kind and it will fill the item and return non-zero if the item was found. -.Ss Name TRANSLATION FUNCTIONS +.Ss Name Translation Functions The function .Fn hid_usage_page will return the symbolic name of a usage page, and the function @@ -190,7 +190,7 @@ Passing .Dv NULL to this function will cause it to use the default table. -.Ss Data EXTRACTION FUNCTIONS +.Ss Data Extraction Functions Given the data obtained from a HID device and an item in the report descriptor the .Fn hid_get_data ==== //depot/projects/hammer/lib/msun/src/math.h#8 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.25 2003/04/04 13:27:47 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.26 2003/05/22 17:07:57 mike Exp $ */ #ifndef _MATH_H_ @@ -249,7 +249,7 @@ * Reentrant version of gamma & lgamma; passes signgam back by reference * as the second argument; user must allocate space for signgam. */ -#ifdef __BSD_VISIBLE +#if __BSD_VISIBLE double gamma_r(double, int *); double lgamma_r(double, int *); #endif /* __BSD_VISIBLE */ @@ -330,7 +330,7 @@ * signgam back by reference as the second argument; user must * allocate space for signgam. */ -#ifdef __BSD_VISIBLE +#if __BSD_VISIBLE float gammaf_r(float, int *); float lgammaf_r(float, int *); #endif /* __BSD_VISIBLE */ ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#20 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.150 2003/05/19 21:32:45 blackend Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.151 2003/05/22 17:25:24 bmah Exp $ Supported Devices @@ -2132,12 +2132,12 @@ SysKonnect SK-9D21 and 9D41 - - Integrated gigabit Ethernet NICs on DELL PowerEdge 2550 + + Integrated Gigabit Ethernet NICs on DELL PowerEdge 2550 servers - - Integrated gigabit Ethernet NICs on IBM x235 servers + + Integrated Gigabit Ethernet NICs on IBM x235 servers ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + Introduction @@ -15,4 +15,10 @@ hardware platform. Versions of the hardware compatibility notes for other architectures will differ in some details. + + More information on &os;/&arch; is contained on + the + &os;/&arch; + Project page. + ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -22,9 +22,10 @@ &artheader; - This document is in a very preliminary state. It is - incomplete, and is almost certainly not be an accurate - reflection of reality. + This is a preliminary document. It is incomplete, and in + need of additional content. Please send additional information + on &arch.print; processors, motherboards, and various devices + working on &os; to the &a.ia64;. §.intro; ==== //depot/projects/hammer/sbin/newfs/mkfs.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.76 2003/05/10 18:58:17 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.77 2003/05/22 18:38:54 dougb Exp $"); #include #include @@ -113,6 +113,12 @@ quad_t sizepb; int width; char tmpbuf[100]; /* XXX this will break in about 2,500 years */ + union { + struct fs fdummy; + char cdummy[SBLOCKSIZE]; + } dummy; +#define fsdummy dummy.fdummy +#define chdummy dummy.cdummy /* * Our blocks == sector size, and the version of UFS we are using is @@ -425,6 +431,24 @@ if (sblock.fs_flags & FS_DOSOFTDEP) printf("\twith soft updates\n"); # undef B2MBFACTOR + + /* + * Wipe out old UFS1 superblock(s) if necessary. + */ + if (!Nflag && Oflag != 1) { + i = bread(&disk, SBLOCK_UFS1 / disk.d_bsize, chdummy, SBLOCKSIZE); + if (i == -1) + err(1, "can't read old UFS1 superblock: %s", disk.d_error); + + if (fsdummy.fs_magic == FS_UFS1_MAGIC) { + fsdummy.fs_magic = 0; + bwrite(&disk, SBLOCK_UFS1 / disk.d_bsize, chdummy, SBLOCKSIZE); + for (i = 0; i < fsdummy.fs_ncg; i++) + bwrite(&disk, fsbtodb(&fsdummy, cgsblock(&fsdummy, i)), + chdummy, SBLOCKSIZE); + } + } + /* * Now build the cylinders group blocks and * then print out indices of cylinder groups. ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.27 2003/05/20 01:46:16 peter Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.28 2003/05/22 16:56:46 anholt Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -50,7 +50,9 @@ . elif ${CPUTYPE} == "k5" _CPUCFLAGS = -march=pentium . elif ${CPUTYPE} == "p4" -_CPUCFLAGS = -march=pentium4 +# gcc 3.2 is known to produce broken code with -march=pentium4, so it is +# disabled for now. This is fixed in gcc 3.3. +_CPUCFLAGS = -march=pentium3 . elif ${CPUTYPE} == "p3" _CPUCFLAGS = -march=pentium3 . elif ${CPUTYPE} == "p2" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#17 (text+ko) ==== @@ -35,11 +35,11 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.257 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.258 2003/05/22 20:09:50 peter Exp $ */ /* - * 386 Trap and System call handling + * AMD64 Trap and System call handling */ #include "opt_clock.h" @@ -194,10 +194,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 22 19:06:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F0F837B404; Thu, 22 May 2003 19:06: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 360CF37B401 for ; Thu, 22 May 2003 19:06:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33E0C43F85 for ; Thu, 22 May 2003 19:06:26 -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 h4N26Q0U096712 for ; Thu, 22 May 2003 19:06:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N26Pbn096709 for perforce@freebsd.org; Thu, 22 May 2003 19:06:25 -0700 (PDT) Date: Thu, 22 May 2003 19:06:25 -0700 (PDT) Message-Id: <200305230206.h4N26Pbn096709@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 31662 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: Fri, 23 May 2003 02:06:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=31662 Change 31662 by peter@peter_daintree on 2003/05/22 19:05:59 Reverse integrate the peter_bighammer branch onto the hammer mainline. This brings 512GB user VM (room for 128TB), a 1GB (room for 512GB) 'direct mapped' segment using 2MB pages (ala alpha/sparc64), moves the kernel to -1GB with room to increase KVM to 512GB. This leans heavily on the 3-level page table pmap code from alpha, but extended for 4 levels. The alpha pmap depends heavily on the direct mapped segment to avoid things like pmap_enter_quick(). pmap_object_init_pt(), pmap_prefault() and pmap_copy() are #if 0'ed out for the moment. Even with these missing, it seems to be a useful checkpoint. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#18 (text+ko) ==== @@ -99,8 +99,11 @@ ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(NPTEPG, NPTEPG); ASSYM(NPDEPG, NPDEPG); -ASSYM(NPDEPTD, NPDEPTD); -ASSYM(NPGPTD, NPGPTD); +ASSYM(addr_PTmap, addr_PTmap); +ASSYM(addr_PDmap, addr_PDmap); +ASSYM(addr_PDPmap, addr_PDPmap); +ASSYM(addr_PML4map, addr_PML4map); +ASSYM(addr_PML4pml4e, addr_PML4pml4e); ASSYM(PDESIZE, sizeof(pd_entry_t)); ASSYM(PTESIZE, sizeof(pt_entry_t)); ASSYM(PTESHIFT, PTESHIFT); @@ -109,9 +112,14 @@ ASSYM(PDRSHIFT, PDRSHIFT); ASSYM(PDPSHIFT, PDPSHIFT); ASSYM(PML4SHIFT, PML4SHIFT); +ASSYM(val_KPDPI, KPDPI); +ASSYM(val_KPML4I, KPML4I); +ASSYM(val_PML4PML4I, PML4PML4I); ASSYM(USRSTACK, USRSTACK); ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); ASSYM(KERNBASE, KERNBASE); +ASSYM(DMAP_MIN_ADDRESS, DMAP_MIN_ADDRESS); +ASSYM(DMAP_MAX_ADDRESS, DMAP_MAX_ADDRESS); ASSYM(MCLBYTES, MCLBYTES); ASSYM(PCB_CR3, offsetof(struct pcb, pcb_cr3)); ASSYM(PCB_R15, offsetof(struct pcb, pcb_r15)); ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#4 (text+ko) ==== @@ -36,8 +36,15 @@ /* * Compiled KERNBASE location */ - .globl kernbase + .globl kernbase,loc_PTmap,loc_PDmap,loc_PDPmap,loc_PML4map,loc_PML4pml4e,dmapbase,dmapend .set kernbase,KERNBASE + .set loc_PTmap,addr_PTmap + .set loc_PDmap,addr_PDmap + .set loc_PDPmap,addr_PDPmap + .set loc_PML4map,addr_PML4map + .set loc_PML4pml4e,addr_PML4pml4e + .set dmapbase,DMAP_MIN_ADDRESS + .set dmapend,DMAP_MAX_ADDRESS .text /********************************************************************** ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#39 (text+ko) ==== @@ -133,11 +133,6 @@ u_int64_t modulep; /* phys addr of metadata table */ u_int64_t physfree; /* first free page after kernel */ -u_int64_t IdlePTD; /* phys addr of kernel PTD */ -u_int64_t IdlePDP; /* phys addr of kernel level 3 */ -u_int64_t IdlePML4; /* phys addr of kernel level 4 */ -struct user *proc0uarea; /* address of proc 0 uarea space */ -vm_offset_t proc0kstack; /* address of proc 0 kstack space */ int cold = 1; @@ -945,7 +940,7 @@ physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); /* call pmap initialization to make new kernel address space */ - pmap_bootstrap(first, 0); + pmap_bootstrap(&first); /* * Size up each available chunk of physical memory. @@ -1086,69 +1081,6 @@ return (ret); } -static void -create_pagetables(void) -{ - u_int64_t p0kpa; - u_int64_t p0upa; - u_int64_t KPTphys; - int i; - - /* Allocate pages */ - KPTphys = allocpages(NKPT); - IdlePML4 = allocpages(NKPML4E); - IdlePDP = allocpages(NKPDPE); - IdlePTD = allocpages(NPGPTD); - p0upa = allocpages(UAREA_PAGES); - p0kpa = allocpages(KSTACK_PAGES); - - proc0uarea = (struct user *)(p0upa + KERNBASE); - proc0kstack = p0kpa + KERNBASE; - - /* Fill in the underlying page table pages */ - /* Read-only from zero to physfree */ - /* XXX not fully used, underneath 2M pages */ - for (i = 0; (i << PAGE_SHIFT) < physfree; i++) { - ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT; - ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V; - } - - /* Now map the page tables at their location within PTmap */ - for (i = 0; i < NKPT; i++) { - ((pd_entry_t *)IdlePTD)[i + KPTDI] = KPTphys + (i << PAGE_SHIFT); - ((pd_entry_t *)IdlePTD)[i + KPTDI] |= PG_RW | PG_V; - } - - /* Map from zero to end of allocations under 2M pages */ - /* This replaces some of the PTD entries above */ - for (i = 0; (i << PDRSHIFT) < physfree; i++) { - ((pd_entry_t *)IdlePTD)[i] = i << PDRSHIFT; - ((pd_entry_t *)IdlePTD)[i] |= PG_RW | PG_V | PG_PS; - } - - /* Now map the page tables at their location within PTmap */ - for (i = 0; i < NKPT; i++) { - ((pd_entry_t *)IdlePTD)[i] = KPTphys + (i << PAGE_SHIFT); - ((pd_entry_t *)IdlePTD)[i] |= PG_RW | PG_V; - } - - /* Now map the PTD at the top of the PTmap (ie: PTD[]) */ - for (i = 0; i < NPGPTD; i++) { - ((pd_entry_t *)IdlePTD)[i + PTDPTDI] = IdlePTD + (i << PAGE_SHIFT); - ((pd_entry_t *)IdlePTD)[i + PTDPTDI] |= PG_RW | PG_V; - } - - /* And connect up the PTD to the PDP */ - for (i = 0; i < NPGPTD; i++) { - ((pdp_entry_t *)IdlePDP)[i] = IdlePTD + (i << PAGE_SHIFT); - ((pdp_entry_t *)IdlePDP)[i] |= PG_RW | PG_V | PG_U; - } - - /* And connect up the PDP to the PML4 */ - ((pdp_entry_t *)IdlePML4)[0] = IdlePDP; - ((pdp_entry_t *)IdlePML4)[0] |= PG_RW | PG_V | PG_U; -} - void hammer_time(void) { @@ -1157,18 +1089,14 @@ struct region_descriptor r_gdt, r_idt; struct pcpu *pc; u_int64_t msr; + char *env; /* Turn on PTE NX (no execute) bit */ msr = rdmsr(MSR_EFER) | EFER_NXE; wrmsr(MSR_EFER, msr); - create_pagetables(); - /* XXX do %cr0 as well */ - load_cr4(rcr4() | CR4_PGE | CR4_PSE); - load_cr3(IdlePML4); - - proc0.p_uarea = proc0uarea; - thread0.td_kstack = proc0kstack; + proc0.p_uarea = (struct user *)(allocpages(UAREA_PAGES) + KERNBASE); + thread0.td_kstack = allocpages(KSTACK_PAGES) + KERNBASE; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; atdevbase = ISA_HOLE_START + KERNBASE; @@ -1310,8 +1238,12 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ - thread0.td_pcb->pcb_cr3 = IdlePML4; + thread0.td_pcb->pcb_cr3 = KPML4phys; thread0.td_frame = &proc0_tf; + + env = getenv("kernelname"); + if (env != NULL) + strlcpy(kernelname, env, sizeof(kernelname)); } void ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#6 (text+ko) ==== @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -177,7 +178,7 @@ addr = trunc_page(uio->uio_offset); eaddr = round_page(uio->uio_offset + c); - if (addr < (vm_offset_t)VADDR(0, 0, PTDPTDI, 0)) + if (addr < (vm_offset_t)KERNBASE) return (EFAULT); for (; addr < eaddr; addr += PAGE_SIZE) if (pmap_extract(kernel_pmap, addr) == 0) ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -125,6 +125,7 @@ #include #include #include +#include #include #include @@ -149,34 +150,19 @@ #endif /* - * Get PDEs and PTEs for user/kernel address space - */ -#define pmap_pde(m, v) (&((m)->pm_pdir[(vm_offset_t)(v) >> PDRSHIFT])) -#define pdir_pde(m, v) (m[(vm_offset_t)(v) >> PDRSHIFT]) - -#define pmap_pde_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_w(pte) ((*(int *)pte & PG_W) != 0) -#define pmap_pte_m(pte) ((*(int *)pte & PG_M) != 0) -#define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) -#define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) - -#define pmap_pte_set_w(pte, v) ((v)?(*(int *)pte |= PG_W):(*(int *)pte &= ~PG_W)) -#define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) - -/* * Given a map and a machine independent protection code, * convert to a vax protection code. */ #define pte_prot(m, p) (protection_codes[p]) -static int protection_codes[8]; +static pt_entry_t protection_codes[8]; struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +vm_paddr_t avail_start; /* PA of first available physical page */ +vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ @@ -184,6 +170,14 @@ static int nkpt; vm_offset_t kernel_vm_end; +static u_int64_t KPTphys; /* phys addr of kernel level 1 */ +static u_int64_t KPDphys; /* phys addr of kernel level 2 */ +static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPML4phys; /* phys addr of kernel level 4 */ + +static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ +static u_int64_t DMPDPphys; /* phys addr of direct mapped level 3 */ + /* * Data for the pv entry allocation mechanism */ @@ -196,10 +190,8 @@ * All those kernel PT submaps that BSD is so fond of */ pt_entry_t *CMAP1 = 0; -static pt_entry_t *CMAP2, *CMAP3, *ptmmap; +static pt_entry_t *ptmmap; caddr_t CADDR1 = 0, ptvmmap = 0; -static caddr_t CADDR2, CADDR3; -static struct mtx CMAPCADDR12_lock; static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; @@ -209,16 +201,15 @@ static pt_entry_t *pt_crashdumpmap; static caddr_t crashdumpmap; -static pt_entry_t *PMAP1 = 0; -static pt_entry_t *PADDR1 = 0; - static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); -static void i386_protection_init(void); +static void amd64_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); +#if 0 static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); +#endif 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, @@ -252,10 +243,192 @@ return newaddr; } +/********************/ +/* Inline functions */ +/********************/ + +/* Return a non-clipped PD index for a given VA */ +static __inline unsigned long +pmap_pde_pindex(vm_offset_t va) +{ + return va >> PDRSHIFT; +} + + +/* Return various clipped indexes for a given VA */ +static __inline int +pmap_pte_index(vm_offset_t va) +{ + + return ((va >> PAGE_SHIFT) & ((1ul << NPTEPGSHIFT) - 1)); +} + +static __inline int +pmap_pde_index(vm_offset_t va) +{ + + return ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); +} + +static __inline int +pmap_pdpe_index(vm_offset_t va) +{ + + return ((va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1)); +} + +static __inline int +pmap_pml4e_index(vm_offset_t va) +{ + + return ((va >> PML4SHIFT) & ((1ul << NPML4EPGSHIFT) - 1)); +} + +/* Return a pointer to the PML4 slot that corresponds to a VA */ +static __inline pml4_entry_t * +pmap_pml4e(pmap_t pmap, vm_offset_t va) +{ + + if (!pmap) + return NULL; + return (&pmap->pm_pml4[pmap_pml4e_index(va)]); +} + +/* Return a pointer to the PDP slot that corresponds to a VA */ +static __inline pdp_entry_t * +pmap_pdpe(pmap_t pmap, vm_offset_t va) +{ + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; + + pml4e = pmap_pml4e(pmap, va); + if (pml4e == NULL || (*pml4e & PG_V) == 0) + return NULL; + pdpe = (pdp_entry_t *)PHYS_TO_DMAP(*pml4e & PG_FRAME); + return (&pdpe[pmap_pdpe_index(va)]); +} + +/* Return a pointer to the PD slot that corresponds to a VA */ +static __inline pd_entry_t * +pmap_pde(pmap_t pmap, vm_offset_t va) +{ + pdp_entry_t *pdpe; + pd_entry_t *pde; + + pdpe = pmap_pdpe(pmap, va); + if (pdpe == NULL || (*pdpe & PG_V) == 0) + return NULL; + pde = (pd_entry_t *)PHYS_TO_DMAP(*pdpe & PG_FRAME); + return (&pde[pmap_pde_index(va)]); +} + +/* Return a pointer to the PT slot that corresponds to a VA */ +static __inline pt_entry_t * +pmap_pte(pmap_t pmap, vm_offset_t va) +{ + pd_entry_t *pde; + pt_entry_t *pte; + + pde = pmap_pde(pmap, va); + if (pde == NULL || (*pde & PG_V) == 0) + return NULL; + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + + +PMAP_INLINE pt_entry_t * +vtopte(vm_offset_t va) +{ + u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); + + return (PTmap + (amd64_btop(va) & mask)); +} + +static u_int64_t +allocpages(int n) +{ + u_int64_t ret; + + ret = avail_start; + bzero((void *)ret, n * PAGE_SIZE); + avail_start += n * PAGE_SIZE; + return (ret); +} + +static void +create_pagetables(void) +{ + int i; + + /* Allocate pages */ + KPTphys = allocpages(NKPT); + KPML4phys = allocpages(1); + KPDPphys = allocpages(NKPML4E); + KPDphys = allocpages(NKPDPE); + + DMPDPphys = allocpages(NDMPML4E); + DMPDphys = allocpages(NDMPDPE); + + /* Fill in the underlying page table pages */ + /* Read-only from zero to physfree */ + /* XXX not fully used, underneath 2M pages */ + for (i = 0; (i << PAGE_SHIFT) < avail_start; i++) { + ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT; + ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V; + } + + /* Now map the page tables at their location within PTmap */ + for (i = 0; i < NKPT; i++) { + ((pd_entry_t *)KPDphys)[i] = KPTphys + (i << PAGE_SHIFT); + ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V; + } + +#if 0 + /* Map from zero to end of allocations under 2M pages */ + /* This replaces some of the KPTphys entries above */ + for (i = 0; (i << PDRSHIFT) < avail_start; i++) { + ((pd_entry_t *)KPDphys)[i] = i << PDRSHIFT; + ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V | PG_PS; + } +#endif + + /* And connect up the PD to the PDP */ + for (i = 0; i < NKPDPE; i++) { + ((pdp_entry_t *)KPDPphys)[i + KPDPI] = KPDphys + (i << PAGE_SHIFT); + ((pdp_entry_t *)KPDPphys)[i + KPDPI] |= PG_RW | PG_V | PG_U; + } + + + /* Now set up the direct map space using 2MB pages */ + for (i = 0; i < NPDEPG; i++) { + ((pd_entry_t *)DMPDphys)[i] = i << PDRSHIFT; + ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS; + } + + /* And the direct map space's PDP */ + for (i = 0; i < NDMPDPE; i++) { + ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys + (i << PAGE_SHIFT); + ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U; + } + + /* And recursively map PML4 to itself in order to get PTmap */ + ((pdp_entry_t *)KPML4phys)[PML4PML4I] = KPML4phys; + ((pdp_entry_t *)KPML4phys)[PML4PML4I] |= PG_RW | PG_V | PG_U; + + /* Connect the Direct Map slot up to the PML4 */ + ((pdp_entry_t *)KPML4phys)[DMPML4I] = DMPDPphys; + ((pdp_entry_t *)KPML4phys)[DMPML4I] |= PG_RW | PG_V | PG_U; + + /* Connect the KVA slot up to the PML4 */ + ((pdp_entry_t *)KPML4phys)[KPML4I] = KPDPphys; + ((pdp_entry_t *)KPML4phys)[KPML4I] |= PG_RW | PG_V | PG_U; +} + /* * Bootstrap the system enough to run with virtual memory. * - * On the i386 this is called after mapping has already been enabled + * On amd64 this is called after mapping has already been enabled * and just syncs the pmap module with what has already been done. * [We can't call it easily with mapping off since the kernel is not * mapped with PA == VA, hence we would have to relocate every address @@ -263,40 +436,39 @@ * (physical) address starting relative to 0] */ void -pmap_bootstrap(firstaddr, loadaddr) - vm_paddr_t firstaddr; - vm_paddr_t loadaddr; +pmap_bootstrap(firstaddr) + vm_paddr_t *firstaddr; { vm_offset_t va; pt_entry_t *pte; - int i; - avail_start = firstaddr; + avail_start = *firstaddr; /* - * XXX The calculation of virtual_avail is wrong. It's NKPT*PAGE_SIZE too - * large. It should instead be correctly calculated in locore.s and - * not based on 'first' (which is a physical address, not a virtual - * address, for the start of unused physical memory). The kernel - * page tables are NOT double mapped and thus should not be included - * in this calculation. + * Create an initial set of page tables to run the kernel in. */ - virtual_avail = (vm_offset_t) KERNBASE + firstaddr; + create_pagetables(); + *firstaddr = avail_start; + + virtual_avail = (vm_offset_t) KERNBASE + avail_start; virtual_avail = pmap_kmem_choose(virtual_avail); virtual_end = VM_MAX_KERNEL_ADDRESS; + + /* XXX do %cr0 as well */ + load_cr4(rcr4() | CR4_PGE | CR4_PSE); + load_cr3(KPML4phys); + /* * Initialize protection array. */ - i386_protection_init(); + amd64_protection_init(); /* * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + IdlePTD); - kernel_pmap->pm_pdp = (pdp_entry_t *) (KERNBASE + IdlePDP); - kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + IdlePML4); + kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); @@ -316,16 +488,11 @@ va = virtual_avail; pte = vtopte(va); - /* - * CMAP1/CMAP2 are used for zeroing and copying pages. - * CMAP3 is used for the idle process page zeroing. + /* + * CMAP1 is only used for the memory test. */ SYSMAP(caddr_t, CMAP1, CADDR1, 1) - SYSMAP(caddr_t, CMAP2, CADDR2, 1) - SYSMAP(caddr_t, CMAP3, CADDR3, 1) - mtx_init(&CMAPCADDR12_lock, "CMAPCADDR12", NULL, MTX_DEF); - /* * Crashdump maps. */ @@ -344,16 +511,9 @@ SYSMAP(struct msgbuf *, msgbufmap, msgbufp, atop(round_page(MSGBUF_SIZE))) - /* - * ptemap is used for pmap_pte_quick - */ - SYSMAP(pt_entry_t *, PMAP1, PADDR1, 1); - virtual_avail = va; - *CMAP1 = *CMAP2 = 0; - for (i = 0; i < NKPT; i++) - PTD[i] = 0; + *CMAP1 = 0; invltlb(); } @@ -365,6 +525,52 @@ return (void *)kmem_alloc(kernel_map, bytes); } +void * +uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + static vm_pindex_t colour; + vm_page_t m; + int pflags; + void *va; + + *flags = UMA_SLAB_PRIV; + + if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT; + else + pflags = VM_ALLOC_SYSTEM; + + if (wait & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + for (;;) { + m = vm_page_alloc(NULL, colour++, pflags | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (wait & M_NOWAIT) + return (NULL); + else + VM_WAIT; + } else + break; + } + + va = (void *)PHYS_TO_DMAP(m->phys_addr); + if ((m->flags & PG_ZERO) == 0) + pagezero(va); + return (va); +} + +void +uma_small_free(void *mem, int size, u_int8_t flags) +{ + vm_page_t m; + + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -431,6 +637,7 @@ * Low level helper routines..... ***************************************************/ + #if defined(PMAP_DIAGNOSTIC) /* @@ -496,48 +703,6 @@ } /* - * Are we current address space or kernel? - */ -static __inline int -pmap_is_current(pmap_t pmap) -{ - return (pmap == kernel_pmap || - (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME)); -} - -/* - * Super fast pmap_pte routine best used when scanning - * the pv lists. This eliminates many coarse-grained - * invltlb calls. Note that many of the pv list - * scans are across different pmaps. It is very wasteful - * to do an entire invltlb for checking a single mapping. - */ -pt_entry_t * -pmap_pte_quick(pmap, va) - register pmap_t pmap; - vm_offset_t va; -{ - pd_entry_t newpf; - pd_entry_t *pde; - - pde = pmap_pde(pmap, va); - if (*pde & PG_PS) - return (pde); - if (*pde != 0) { - /* are we current address space or kernel? */ - if (pmap_is_current(pmap)) - return vtopte(va); - newpf = *pde & PG_FRAME; - if (((*PMAP1) & PG_FRAME) != newpf) { - *PMAP1 = newpf | PG_RW | PG_V; - pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR1); - } - return PADDR1 + (amd64_btop(va) & (NPTEPG - 1)); - } - return (0); -} - -/* * Routine: pmap_extract * Function: * Extract the physical page address associated @@ -550,24 +715,47 @@ { vm_paddr_t rtval; pt_entry_t *pte; - pd_entry_t pde; + pd_entry_t pde, *pdep; if (pmap == 0) return 0; - pde = pmap->pm_pdir[va >> PDRSHIFT]; - if (pde != 0) { - if ((pde & PG_PS) != 0) { - rtval = (pde & ~PDRMASK) | (va & PDRMASK); + pdep = pmap_pde(pmap, va); + if (pdep) { + pde = *pdep; + if (pde) { + if ((pde & PG_PS) != 0) { + rtval = (pde & ~PDRMASK) | (va & PDRMASK); + return rtval; + } + pte = pmap_pte(pmap, va); + rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); return rtval; } - pte = pmap_pte_quick(pmap, va); - rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); - return rtval; } return 0; } +vm_paddr_t +pmap_kextract(vm_offset_t va) +{ + pd_entry_t *pde; + vm_paddr_t pa; + + if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) { + pa = DMAP_TO_PHYS(va); + } else { + pde = pmap_pde(kernel_pmap, va); + if (*pde & PG_PS) { + pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + } else { + pa = *vtopte(va); + pa = (pa & PG_FRAME) | (va & PAGE_MASK); + } + } + return pa; +} + /*************************************************** * Low level mapping routines..... ***************************************************/ @@ -689,7 +877,7 @@ #endif /* - * Create the kernel stack (including pcb for i386) for a new thread. + * Create the kernel stack (including pcb for amd64) for a new thread. * This routine directly affects the fork perf for a process and * create performance for a thread. */ @@ -899,7 +1087,7 @@ * drops to zero, then it decrements the wire count. */ static int -_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) +_pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) { while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt")) @@ -910,16 +1098,51 @@ /* * unmap the page table page */ - pmap->pm_pdir[m->pindex] = 0; + if (m->pindex >= (NUPDE + NUPDPE)) { + /* PDP page */ + pml4_entry_t *pml4; + pml4 = pmap_pml4e(pmap, va); + pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE)); + *pml4 = 0; + } else if (m->pindex >= NUPDE) { + /* PD page */ + pdp_entry_t *pdp; + pdp = pmap_pdpe(pmap, va); + pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE); + *pdp = 0; + } else { + /* PTE page */ + pd_entry_t *pd; + pd = pmap_pde(pmap, va); + pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex); + *pd = 0; + } --pmap->pm_stats.resident_count; - if (pmap_is_current(pmap)) { - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pteva = VM_MAXUSER_ADDRESS + amd64_ptob(m->pindex); - pmap_invalidate_page(pmap, pteva); + if (m->pindex < NUPDE) { + /* Unhold the PD page */ + vm_page_t pdpg; + pdpg = vm_page_lookup(pmap->pm_pteobj, NUPDE + pmap_pdpe_index(va)); + while (vm_page_sleep_if_busy(pdpg, FALSE, "pulook")) + vm_page_lock_queues(); + vm_page_unhold(pdpg); + if (pdpg->hold_count == 0) + _pmap_unwire_pte_hold(pmap, va, pdpg); + } + if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) { + /* Unhold the PDP page */ + vm_page_t pdppg; + pdppg = vm_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + pmap_pml4e_index(va)); + while (vm_page_sleep_if_busy(pdppg, FALSE, "pulooK")) + vm_page_lock_queues(); + vm_page_unhold(pdppg); + if (pdppg->hold_count == 0) + _pmap_unwire_pte_hold(pmap, va, pdppg); } + /* + * Do an invltlb to make the invalidated mapping + * take effect immediately. + */ + pmap_invalidate_page(pmap, pteva); /* * If the page is finally unwired, simply free it. @@ -936,11 +1159,11 @@ } static PMAP_INLINE int -pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) +pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) { vm_page_unhold(m); if (m->hold_count == 0) - return _pmap_unwire_pte_hold(pmap, m); + return _pmap_unwire_pte_hold(pmap, va, m); else return 0; } @@ -952,23 +1175,24 @@ static int pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) { - unsigned ptepindex; + unsigned long ptepindex; + if (va >= VM_MAXUSER_ADDRESS) return 0; if (mpte == NULL) { - ptepindex = (va >> PDRSHIFT); + ptepindex = pmap_pde_pindex(va); if (pmap->pm_pteobj->root && - (pmap->pm_pteobj->root->pindex == ptepindex)) { + pmap->pm_pteobj->root->pindex == ptepindex) { mpte = pmap->pm_pteobj->root; } else { while ((mpte = vm_page_lookup(pmap->pm_pteobj, ptepindex)) != NULL && - vm_page_sleep_if_busy(mpte, FALSE, "pulook")) + vm_page_sleep_if_busy(mpte, FALSE, "pulook")) vm_page_lock_queues(); } } - return pmap_unwire_pte_hold(pmap, mpte); + return pmap_unwire_pte_hold(pmap, va, mpte); } void @@ -976,9 +1200,7 @@ struct pmap *pmap; { - pmap->pm_pdir = (pd_entry_t *)(KERNBASE + IdlePTD); - pmap->pm_pdp = (pdp_entry_t *)(KERNBASE + IdlePDP); - pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + IdlePML4); + pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -995,90 +1217,39 @@ pmap_pinit(pmap) register struct pmap *pmap; { - vm_page_t ptdpg[NPGPTD]; - vm_page_t pdppg; vm_page_t pml4pg; - vm_paddr_t pa; - int i; - - /* - * No need to allocate page table space yet but we do need a valid - * page directory table. - */ - if (pmap->pm_pdir == NULL) { - pmap->pm_pdir = (pd_entry_t *)kmem_alloc_pageable(kernel_map, - NBPTD); - pmap->pm_pdp = (pdp_entry_t *)kmem_alloc_pageable(kernel_map, - PAGE_SIZE); - pmap->pm_pml4 = (pml4_entry_t *)kmem_alloc_pageable(kernel_map, - PAGE_SIZE); - } /* * allocate object for the ptes */ if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, PTDPTDI + - NPGPTD + 2); + pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUPDE + NUPDPE + NUPML4E + 1); /* - * allocate the page directory page(s) + * allocate the page directory page */ - for (i = 0; i < NPGPTD; i++) { - ptdpg[i] = vm_page_grab(pmap->pm_pteobj, PTDPTDI + i, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | - VM_ALLOC_ZERO); - vm_page_lock_queues(); - vm_page_flag_clear(ptdpg[i], PG_BUSY); - ptdpg[i]->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); - } - - pml4pg = vm_page_grab(pmap->pm_pteobj, PTDPTDI + NPGPTD, + pml4pg = vm_page_grab(pmap->pm_pteobj, NUPDE + NUPDPE + NUPML4E, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); vm_page_flag_clear(pml4pg, PG_BUSY); pml4pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); - pdppg = vm_page_grab(pmap->pm_pteobj, PTDPTDI + NPGPTD + 1, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); - vm_page_lock_queues(); - vm_page_flag_clear(pdppg, PG_BUSY); - pdppg->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); + pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pml4pg)); - pmap_qenter((vm_offset_t)pmap->pm_pdir, ptdpg, NPGPTD); - pmap_qenter((vm_offset_t)pmap->pm_pdp, &pdppg, 1); - pmap_qenter((vm_offset_t)pmap->pm_pml4, &pml4pg, 1); - - for (i = 0; i < NPGPTD; i++) { - if ((ptdpg[i]->flags & PG_ZERO) == 0) - bzero(pmap->pm_pdir + (i * NPDEPG), PAGE_SIZE); - } - if ((pdppg->flags & PG_ZERO) == 0) - bzero(pmap->pm_pdp, PAGE_SIZE); if ((pml4pg->flags & PG_ZERO) == 0) bzero(pmap->pm_pml4, PAGE_SIZE); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + /* Wire in kernel global address entries. */ - bcopy(PTD + KPTDI, pmap->pm_pdir + KPTDI, nkpt * sizeof(pd_entry_t)); + pmap->pm_pml4[KPML4I] = KPDPphys | PG_RW | PG_V | PG_U; + pmap->pm_pml4[DMPML4I] = DMPDPphys | PG_RW | PG_V | PG_U; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 22 19:14:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 624D037B404; Thu, 22 May 2003 19:14:37 -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 0F4AE37B401 for ; Thu, 22 May 2003 19:14:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD21C43F85 for ; Thu, 22 May 2003 19:14:36 -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 h4N2Ea0U097030 for ; Thu, 22 May 2003 19:14:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N2Ea9x097027 for perforce@freebsd.org; Thu, 22 May 2003 19:14:36 -0700 (PDT) Date: Thu, 22 May 2003 19:14:36 -0700 (PDT) Message-Id: <200305230214.h4N2Ea9x097027@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 31663 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: Fri, 23 May 2003 02:14:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=31663 Change 31663 by peter@peter_hammer on 2003/05/22 19:14:29 Revert accidental deletion of syscons etc. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#12 (text+ko) ==== @@ -59,18 +59,18 @@ options KTRACE # atkbdc0 controls both the keyboard and the PS/2 mouse -#device atkbdc # AT keyboard controller -#device atkbd # AT keyboard -#device psm # PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse -#device vga # VGA video card driver +device vga # VGA video card driver -#device splash # Splash screen and screen saver support +device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console -#device sc +device sc -##device agp # support several AGP chipsets +#device agp # support several AGP chipsets # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports @@ -84,7 +84,7 @@ # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support device fxp # Intel EtherExpress PRO/100B (82557, 82558) -#device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') +device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') device bge # Broadcom BCM570xx Gigabit Ethernet # Pseudo devices - the number indicates how many units to allocate. From owner-p4-projects@FreeBSD.ORG Thu May 22 19:38:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 314DD37B404; Thu, 22 May 2003 19:38:06 -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 E564937B401 for ; Thu, 22 May 2003 19:38:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92FC143FBD for ; Thu, 22 May 2003 19:38:05 -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 h4N2c50U097881 for ; Thu, 22 May 2003 19:38:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N2c5lg097873 for perforce@freebsd.org; Thu, 22 May 2003 19:38:05 -0700 (PDT) Date: Thu, 22 May 2003 19:38:05 -0700 (PDT) Message-Id: <200305230238.h4N2c5lg097873@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 31664 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: Fri, 23 May 2003 02:38:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=31664 Change 31664 by peter@peter_hammer on 2003/05/22 19:37:18 Make syscons (vga specifically) work again after moving KVM (atdevbase in particular) above 4GB. Affected files ... .. //depot/projects/hammer/sys/dev/fb/vga.c#12 edit Differences ... ==== //depot/projects/hammer/sys/dev/fb/vga.c#12 (text+ko) ==== @@ -1792,7 +1792,7 @@ { #ifndef VGA_NO_FONT_LOADING u_char buf[PARAM_BUFSIZE]; - u_int32_t segment; + vm_offset_t segment; int c; #ifdef VGA_ALT_SEQACCESS int s; @@ -1872,7 +1872,7 @@ { #ifndef VGA_NO_FONT_LOADING u_char buf[PARAM_BUFSIZE]; - u_int32_t segment; + vm_offset_t segment; int c; #ifdef VGA_ALT_SEQACCESS int s; From owner-p4-projects@FreeBSD.ORG Thu May 22 19:55:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A94737B404; Thu, 22 May 2003 19:55: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 2189B37B401 for ; Thu, 22 May 2003 19:55:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D6C243F3F for ; Thu, 22 May 2003 19:55:28 -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 h4N2tS0U098799 for ; Thu, 22 May 2003 19:55:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N2tS84098796 for perforce@freebsd.org; Thu, 22 May 2003 19:55:28 -0700 (PDT) Date: Thu, 22 May 2003 19:55:28 -0700 (PDT) Message-Id: <200305230255.h4N2tS84098796@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 31667 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: Fri, 23 May 2003 02:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=31667 Change 31667 by peter@peter_hammer on 2003/05/22 19:54:53 Finish off pmap_prefault(), and implicitly pmap_enter_quick(). I have to wonder if it might not be easier to just use pmap_enter() for this stuff and speed up pmap_enter() a bit. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -206,10 +206,8 @@ static void amd64_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -#if 0 static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); -#endif 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, @@ -2137,7 +2135,6 @@ * but is *MUCH* faster than pmap_enter... */ -#if 0 static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { @@ -2150,7 +2147,7 @@ */ if (va < VM_MAXUSER_ADDRESS) { unsigned ptepindex; - pd_entry_t ptepa; + pd_entry_t *ptepa; /* * Calculate pagetable page index @@ -2163,14 +2160,14 @@ /* * Get the page directory entry */ - ptepa = pmap->pm_pdir[ptepindex]; + ptepa = pmap_pde(pmap, va); /* * If the page table page is mapped, we just increment * the hold count, and activate it. */ - if (ptepa) { - if (ptepa & PG_PS) + if (ptepa && (*ptepa & PG_V) != 0) { + if (*ptepa & PG_PS) panic("pmap_enter_quick: unexpected mapping into 2MB page"); if (pmap->pm_pteobj->root && (pmap->pm_pteobj->root->pindex == ptepindex)) { @@ -2230,7 +2227,6 @@ return mpte; } -#endif /* * Make a temporary mapping for a physical address. This is only intended @@ -2395,14 +2391,12 @@ #define PFFOR 4 #define PAGEORDER_SIZE (PFBAK+PFFOR) -#if 0 static int pmap_prefault_pageorder[] = { -1 * PAGE_SIZE, 1 * PAGE_SIZE, -2 * PAGE_SIZE, 2 * PAGE_SIZE, -3 * PAGE_SIZE, 3 * PAGE_SIZE, -4 * PAGE_SIZE, 4 * PAGE_SIZE }; -#endif void pmap_prefault(pmap, addra, entry) @@ -2410,13 +2404,13 @@ vm_offset_t addra; vm_map_entry_t entry; { -#if 0 int i; vm_offset_t starta; vm_offset_t addr; vm_pindex_t pindex; vm_page_t m, mpte; vm_object_t object; + pd_entry_t *pde; if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) return; @@ -2442,11 +2436,12 @@ if (addr < starta || addr >= entry->end) continue; - if ((*pmap_pde(pmap, addr)) == 0) + pde = pmap_pde(pmap, addr); + if (pde == NULL || (*pde & PG_V) == 0) continue; pte = vtopte(addr); - if (*pte) + if ((*pte & PG_V) == 0) continue; pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; @@ -2481,7 +2476,6 @@ } vm_page_unlock_queues(); } -#endif } /* From owner-p4-projects@FreeBSD.ORG Thu May 22 20:03:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C561537B404; Thu, 22 May 2003 20:03:39 -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 7A1F337B401 for ; Thu, 22 May 2003 20:03:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2372A43F85 for ; Thu, 22 May 2003 20:03:39 -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 h4N33c0U000161 for ; Thu, 22 May 2003 20:03:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N33csU000157 for perforce@freebsd.org; Thu, 22 May 2003 20:03:38 -0700 (PDT) Date: Thu, 22 May 2003 20:03:38 -0700 (PDT) Message-Id: <200305230303.h4N33csU000157@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 31668 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: Fri, 23 May 2003 03:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=31668 Change 31668 by peter@peter_hammer on 2003/05/22 20:03:02 reactivate pmap_object_init_pt() Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -2254,8 +2254,7 @@ vm_object_t object, vm_pindex_t pindex, vm_size_t size, int limit) { -#if 0 - vm_offset_t tmpidx; + vm_pindex_t tmpidx; int psize; vm_page_t p, mpte; @@ -2271,14 +2270,12 @@ ((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) { int i; vm_page_t m[1]; - unsigned int ptepindex; int npdes; - pd_entry_t ptepa; + pd_entry_t ptepa, *pde; - ptepindex = pmap_pde_pindex(addr); - if (pmap->pm_pdir[ptepindex]) + pde = pmap_pde(pmap, addr); + if (pde != 0 && (*pde & PG_V) != 0) return; - retry: p = vm_page_lookup(object, pindex); if (p != NULL) { @@ -2314,10 +2311,9 @@ pmap->pm_stats.resident_count += size >> PAGE_SHIFT; npdes = size >> PDRSHIFT; for(i = 0; i < npdes; i++) { - pde_store(&pmap->pm_pdir[ptepindex], - ptepa | PG_U | PG_RW | PG_V | PG_PS); + pde_store(pde, ptepa | PG_U | PG_RW | PG_V | PG_PS); ptepa += NBPDR; - ptepindex += 1; + pde++; } pmap_invalidate_all(kernel_pmap); return; @@ -2377,8 +2373,6 @@ } vm_page_unlock_queues(); } - return; -#endif } /* From owner-p4-projects@FreeBSD.ORG Thu May 22 20:27:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC85837B404; Thu, 22 May 2003 20:27: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 65B6537B401 for ; Thu, 22 May 2003 20:27:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B0B043F93 for ; Thu, 22 May 2003 20:27:08 -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 h4N3R70U001067 for ; Thu, 22 May 2003 20:27:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N3R7iO001064 for perforce@freebsd.org; Thu, 22 May 2003 20:27:07 -0700 (PDT) Date: Thu, 22 May 2003 20:27:07 -0700 (PDT) Message-Id: <200305230327.h4N3R7iO001064@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 31670 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: Fri, 23 May 2003 03:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=31670 Change 31670 by peter@peter_hammer on 2003/05/22 20:26:20 re-enable pmap_copy(). Thats all of the stubbed out functions repaired. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -701,6 +701,16 @@ } /* + * Are we current address space or kernel? + */ +static __inline int +pmap_is_current(pmap_t pmap) +{ + return (pmap == kernel_pmap || + (pmap->pm_pml4[PML4PML4I] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); +} + +/* * Routine: pmap_extract * Function: * Extract the physical page address associated @@ -2518,7 +2528,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len, vm_offset_t src_addr) { -#if 0 vm_offset_t addr; vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; @@ -2533,7 +2542,7 @@ for (addr = src_addr; addr < end_addr; addr = pdnxt) { pt_entry_t *src_pte, *dst_pte; vm_page_t dstmpte, srcmpte; - pd_entry_t srcptepaddr; + pd_entry_t srcptepaddr, *pde; unsigned ptepindex; if (addr >= UPT_MIN_ADDRESS) @@ -2551,13 +2560,25 @@ pdnxt = (addr + NBPDR) & ~PDRMASK; ptepindex = pmap_pde_pindex(addr); - srcptepaddr = src_pmap->pm_pdir[ptepindex]; + pde = pmap_pde(src_pmap, addr); + if (pde) + srcptepaddr = *pde; + else + continue; if (srcptepaddr == 0) continue; if (srcptepaddr & PG_PS) { - if (dst_pmap->pm_pdir[ptepindex] == 0) { - dst_pmap->pm_pdir[ptepindex] = srcptepaddr; + pde = pmap_pde(dst_pmap, addr); + if (pde == 0) { + /* + * XXX should do an allocpte here to + * instantiate the pde + */ + continue; + } + if (*pde == 0) { + *pde = srcptepaddr; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } @@ -2610,7 +2631,6 @@ src_pte++; } } -#endif } /* From owner-p4-projects@FreeBSD.ORG Thu May 22 20:30:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30CA737B404; Thu, 22 May 2003 20:30:13 -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 B86E837B401 for ; Thu, 22 May 2003 20:30:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6352243F3F for ; Thu, 22 May 2003 20:30:12 -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 h4N3UC0U001173 for ; Thu, 22 May 2003 20:30:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N3UB5Y001170 for perforce@freebsd.org; Thu, 22 May 2003 20:30:11 -0700 (PDT) Date: Thu, 22 May 2003 20:30:11 -0700 (PDT) Message-Id: <200305230330.h4N3UB5Y001170@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 31671 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: Fri, 23 May 2003 03:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=31671 Change 31671 by peter@peter_hammer on 2003/05/22 20:30:01 minor optimization. only invalidate page if it is the current pmap. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -1146,11 +1146,13 @@ if (pdppg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, pdppg); } - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); + if (pmap_is_current(pmap)) { + /* + * Do an invltlb to make the invalidated mapping + * take effect immediately. + */ + pmap_invalidate_page(pmap, pteva); + } /* * If the page is finally unwired, simply free it. From owner-p4-projects@FreeBSD.ORG Thu May 22 20:47:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7C337B404; Thu, 22 May 2003 20:47:34 -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 4829437B401 for ; Thu, 22 May 2003 20:47:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E59C343F3F for ; Thu, 22 May 2003 20:47:33 -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 h4N3lX0U006963 for ; Thu, 22 May 2003 20:47:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N3lXsE006960 for perforce@freebsd.org; Thu, 22 May 2003 20:47:33 -0700 (PDT) Date: Thu, 22 May 2003 20:47:33 -0700 (PDT) Message-Id: <200305230347.h4N3lXsE006960@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 31672 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: Fri, 23 May 2003 03:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=31672 Change 31672 by peter@peter_hammer on 2003/05/22 20:47:07 move the recursive pml4 slot to the bottom of the negative address space, to leave all 256 positive slots for userland, for a total of 128TB of user space. I haven't increased NUPML4E though because I'm not sure how the 'unsigned pindex' stuff is going to go, and haven't investigated the vm_page_t hold_count stuff for the page table pages. It should be save to increase it from 1 to 2 though, thats 1TB of user VM space. That should be enough for a 'beta' release :-) Affected files ... .. //depot/projects/hammer/sys/amd64/include/pmap.h#9 edit .. //depot/projects/hammer/sys/amd64/include/vmparam.h#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pmap.h#9 (text+ko) ==== @@ -113,7 +113,7 @@ /* * The *PDI values control the layout of virtual memory */ -#define PML4PML4I 1 +#define PML4PML4I (NPML4EPG/2) /* Index of recursive pml4 mapping */ #define KPML4I (NPML4EPG-1) #define DMPML4I (KPML4I-1) ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#8 (text+ko) ==== @@ -103,7 +103,7 @@ #define UPT_MAX_ADDRESS VADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I) #define UPT_MIN_ADDRESS VADDR(PML4PML4I, 0, 0, 0) -#define VM_MAXUSER_ADDRESS UPT_MIN_ADDRESS +#define VM_MAXUSER_ADDRESS VADDR(NUPML4E, 0, 0, 0) #define USRSTACK VM_MAXUSER_ADDRESS From owner-p4-projects@FreeBSD.ORG Thu May 22 20:49:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C2237B404; Thu, 22 May 2003 20:49:39 -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 D524A37B401 for ; Thu, 22 May 2003 20:49:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5C8243F75 for ; Thu, 22 May 2003 20:49:37 -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 h4N3nb0U007696 for ; Thu, 22 May 2003 20:49:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N3naE8007678 for perforce@freebsd.org; Thu, 22 May 2003 20:49:36 -0700 (PDT) Date: Thu, 22 May 2003 20:49:36 -0700 (PDT) Message-Id: <200305230349.h4N3naE8007678@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 31673 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: Fri, 23 May 2003 03:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=31673 Change 31673 by marcel@marcel_nfs on 2003/05/22 20:48:36 IFC @31661 Affected files ... .. //depot/projects/ia64/Makefile.inc1#63 integrate .. //depot/projects/ia64/lib/libc/gen/arc4random.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getfsent.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.3#5 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#6 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/wcstod.3#4 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.3#7 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.3#10 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.3#7 integrate .. //depot/projects/ia64/lib/libc/sys/jail.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/sendfile.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#7 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.3#4 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#7 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.3#4 integrate .. //depot/projects/ia64/lib/msun/src/math.h#14 integrate .. //depot/projects/ia64/release/Makefile#53 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#51 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#93 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#29 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#32 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#8 integrate .. //depot/projects/ia64/share/man/man4/agp.4#4 integrate .. //depot/projects/ia64/share/man/man4/bge.4#6 integrate .. //depot/projects/ia64/share/man/man4/dpt.4#4 integrate .. //depot/projects/ia64/share/man/man4/em.4#9 integrate .. //depot/projects/ia64/share/man/man4/geom.4#8 integrate .. //depot/projects/ia64/share/man/man4/ip.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac_ifoff.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_mls.4#11 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_partition.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#6 integrate .. //depot/projects/ia64/share/man/man4/ng_bluetooth.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_bt3c.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_btsocket.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_h4.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_hci.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_l2cap.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_ubt.4#4 integrate .. //depot/projects/ia64/share/man/man4/oldcard.4#3 integrate .. //depot/projects/ia64/share/man/man4/raid.4#3 integrate .. //depot/projects/ia64/share/man/man4/syscons.4#6 integrate .. //depot/projects/ia64/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/ia64/share/man/man4/umass.4#9 integrate .. //depot/projects/ia64/share/man/man4/wi.4#20 integrate .. //depot/projects/ia64/share/man/man5/fs.5#6 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#35 integrate .. //depot/projects/ia64/share/man/man5/procfs.5#6 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#38 integrate .. //depot/projects/ia64/share/man/man7/development.7#3 integrate .. //depot/projects/ia64/share/man/man7/maclabel.7#3 integrate .. //depot/projects/ia64/share/man/man7/release.7#21 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#20 integrate .. //depot/projects/ia64/share/man/man9/BUS_SETUP_INTR.9#4 integrate .. //depot/projects/ia64/share/man/man9/Makefile#23 integrate .. //depot/projects/ia64/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/ia64/share/man/man9/byteorder.9#5 integrate .. //depot/projects/ia64/share/man/man9/device_get_ivars.9#3 integrate .. //depot/projects/ia64/share/man/man9/device_get_softc.9#3 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#11 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#10 integrate .. //depot/projects/ia64/share/man/man9/mutex.9#10 integrate .. //depot/projects/ia64/share/man/man9/signal.9#4 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#15 integrate .. //depot/projects/ia64/share/mk/bsd.info.mk#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#31 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#27 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#35 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#35 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#11 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#11 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#9 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#14 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumlock.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinummemory.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumobj.h#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumvar.h#3 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#33 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#4 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#24 integrate .. //depot/projects/ia64/sys/sys/stat.h#14 integrate .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#6 integrate .. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 integrate .. //depot/projects/ia64/usr.bin/catman/catman.c#6 integrate .. //depot/projects/ia64/usr.bin/ipcs/ipcs.1#5 integrate .. //depot/projects/ia64/usr.bin/logger/logger.1#3 integrate .. //depot/projects/ia64/usr.bin/mt/mt.1#8 integrate .. //depot/projects/ia64/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/ia64/usr.bin/stat/stat.1#4 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#7 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.1#15 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.8#7 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/bcmfw.8#2 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#4 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#6 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/hcsecd.8#2 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#6 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#6 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#6 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#14 integrate .. //depot/projects/ia64/usr.sbin/chown/chgrp.1#3 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.8#4 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.8#10 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#16 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#19 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.h#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#29 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#10 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#13 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#63 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.362 2003/05/21 21:47:20 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -695,7 +695,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_KERBEROS) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +782,8 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && !defined(NO_KERBEROS) +.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/ia64/lib/libc/gen/arc4random.3#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" Manual page, using -mandoc macros -.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.14 2003/05/01 20:27:59 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.15 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 15, 1997 .Dt ARC4RANDOM 3 @@ -57,7 +57,8 @@ can be in about .if t 2\u\s71700\s10\d .if n (2**1700) -states. The +states. +The .Fn arc4random function returns pseudo-random numbers in the range of 0 to .if t 2\u\s731\s10\d\(mi1, @@ -87,7 +88,7 @@ functions using .Fn arc4random : .Pp -.Dl #define foo4random() (arc4random() % ((unsigned)RAND_MAX + 1)) +.Dl "#define foo4random() (arc4random() % ((unsigned)RAND_MAX + 1))" .Sh SEE ALSO .Xr rand 3 , .Xr random 3 , ==== //depot/projects/ia64/lib/libc/gen/getfsent.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.14 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 7, 2003 .Dt GETFSENT 3 @@ -46,11 +46,11 @@ .Lb libc .Sh SYNOPSIS .In fstab.h -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsent void -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsspec "const char *spec" -.Ft struct fstab * +.Ft "struct fstab *" .Fn getfsfile "const char *file" .Ft int .Fn setfsent void @@ -58,7 +58,7 @@ .Fn endfsent void .Ft void .Fn setfstab "const char *file" -.Ft const char * +.Ft "const char *" .Fn getfstab void .Sh DESCRIPTION The @@ -103,11 +103,11 @@ The value set by .Fn setfstab does not persist across calls to -.Fn endfsent +.Fn endfsent . .Pp The .Fn getfstab -function returns the name of the file that that will be used. +function returns the name of the file that will be used. .Pp The .Fn getfsspec @@ -145,17 +145,17 @@ function returns nothing. .Sh ENVIRONMENT -.Bl -tag -width PATH_FSTAB -.It Pa PATH_FSTAB +.Bl -tag -width ".Ev PATH_FSTAB" +.It Ev PATH_FSTAB If the environment variable -.Pa PATH_FSTAB -is set all operations are performed against the specified file. -.Pa PATH_FSTAB +.Ev PATH_FSTAB +is set, all operations are performed against the specified file. +.Ev PATH_FSTAB will not be honored if the process environment or memory address space is considred .Dq tainted . (See -.Fn issetugid +.Xr issetugid 2 for more information.) .El .Sh FILES ==== //depot/projects/ia64/lib/libc/gen/getpwent.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getpwent.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.22 2003/04/17 14:15:26 nectar Exp $ +.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.23 2003/05/22 13:02:26 ru Exp $ .\" .Dd April 16, 2003 .Dt GETPWENT 3 @@ -194,7 +194,8 @@ and .Fn getpwuid_r return 0 if no error occurred, or an error number to indicate failure. -It is not an error if a matching entry is not found. (Thus, if +It is not an error if a matching entry is not found. +(Thus, if .Fa result is .Dv NULL ==== //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.15 2003/05/22 13:02:27 ru Exp $ .\" .Dd July 27, 1998 .Os @@ -75,13 +75,14 @@ .Fa int_map argument is a bitmap which determines whether vm86 interrupts should be handled -in vm86 mode, or reflected back to the process. If the +in vm86 mode, or reflected back to the process. +If the .Em Nth bit is set, the interrupt will be reflected to the process, otherwise it will be dispatched by the vm86 interrupt table. .It Dv VM86_INTCALL -This allows calls to be made to vm86 interrupt handlers by the process. It -effectively simulates an INT instruction. +This allows calls to be made to vm86 interrupt handlers by the process. +It effectively simulates an INT instruction. .Fa data should point to the following structure: .Bd -literal @@ -92,8 +93,8 @@ .Ed .Pp .Fa intnum -specifies the operand of INT for the simulated call. A value of 0x10, for -example, would often be used to call into the VGA BIOS. +specifies the operand of INT for the simulated call. +A value of 0x10, for example, would often be used to call into the VGA BIOS. .Fa vmf is used to initialize CPU registers according to the calling convention for the interrupt handler. @@ -117,7 +118,8 @@ .Xr sigreturn 2 with the correct machine context for vm86, and with the .Dv PSL_VM -bit set. Control returns to the process upon delivery of a signal. +bit set. +Control returns to the process upon delivery of a signal. .Sh RETURN VALUES .Rv -std i386_vm86 .Sh ERRORS @@ -132,6 +134,7 @@ There is not enough memory to initialize the kernel data structures. .El .Sh AUTHORS +.An -nosplit This man page was written by .An Jonathan Lemon , and updated by ==== //depot/projects/ia64/lib/libc/locale/setlocale.3#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setlocale.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.26 2003/03/20 08:13:34 ache Exp $ +.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.27 2003/05/22 13:02:27 ru Exp $ .\" .Dd October 5, 2002 .Dt SETLOCALE 3 @@ -177,7 +177,7 @@ .Bl -tag -width mon_decimal_point .It Fa decimal_point The decimal point character, except for currency values, -can't be the empty string. +cannot be an empty string. .It Fa thousands_sep The separator between groups of digits before the decimal point, except for currency values. ==== //depot/projects/ia64/lib/libc/locale/wcstod.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.3 2003/03/13 06:29:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $ .\" .Dd February 22, 2003 .Dt WCSTOD 3 @@ -31,14 +31,17 @@ .Nm wcstof , .Nm wcstod , .Nm wcstold -.Nd "convert string to float, double or long double" +.Nd convert string to +.Vt float , double +or +.Vt "long double" .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In wchar.h .Ft float .Fn wcstof "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" -.Ft long double +.Ft "long double" .Fn wcstold "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" .Ft double .Fn wcstod "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" @@ -53,13 +56,13 @@ .Fn strtod and .Fn strtold -functios. +functions. Refer to .Xr strtod 3 for details. .Sh SEE ALSO .Xr strtod 3 , -.Xr wcstol 3 , +.Xr wcstol 3 .Sh STANDARDS The .Fn wcstof , ==== //depot/projects/ia64/lib/libc/net/nsdispatch.3#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.11 2003/05/22 13:02:27 ru Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -74,7 +74,8 @@ .Pp Each method has the function signature described by the typedef: .Pp -.Ft typedef "int \*(lp*nss_method\*(rp\*(lpvoid *retval, void *mdata, va_list *ap\*(rp" ; +.Ft typedef int +.Fn \*(lp*nss_method\*(rp "void *retval" "void *mdata" "va_list *ap" ; .Pp .Va dtab is an array of @@ -175,12 +176,12 @@ .Ss Valid source types While there is support for arbitrary sources, the following #defines for commonly implemented sources are available: -.Bl -column NS_COMPAT COMPAT -offset indent +.Bl -column NSSRC_COMPAT compat -offset indent .It Sy "#define value" -.It "NSSRC_FILES ""files""" -.It "NSSRC_DNS ""dns""" -.It "NSSRC_NIS ""nis""" -.It "NSSRC_COMPAT ""compat""" +.It Dv NSSRC_FILES Ta """files"" +.It Dv NSSRC_DNS Ta """dns"" +.It Dv NSSRC_NIS Ta """nis"" +.It Dv NSSRC_COMPAT Ta """compat"" .El .Pp Refer to @@ -192,13 +193,13 @@ .Vt nss_method functions must return one of the following values depending upon status of the lookup: -.Bl -column "RETURN VALUE" "STATUS CODE" +.Bl -column "Return value" "Status code" .It Sy "Return value Status code" -.It "NS_SUCCESS success" -.It "NS_NOTFOUND notfound" -.It "NS_UNAVAIL unavail" -.It "NS_TRYAGAIN tryagain" -.It "NS_RETURN -none-" +.It Dv NS_SUCCESS Ta success +.It Dv NS_NOTFOUND Ta notfound +.It Dv NS_UNAVAIL Ta unavail +.It Dv NS_TRYAGAIN Ta tryagain +.It Dv NS_RETURN Ta -none- .El .Pp Refer to @@ -208,12 +209,14 @@ The .Fn nsdispatch function returns the value of the method that caused the dispatcher to -terminate, or NS_NOTFOUND otherwise. +terminate, or +.Dv NS_NOTFOUND +otherwise. .Sh SEE ALSO .Xr hesiod 3 , .Xr stdarg 3 , -.Xr yp 8 , -.Xr nsswitch.conf 5 +.Xr nsswitch.conf 5 , +.Xr yp 8 .Sh HISTORY The .Fn nsdispatch @@ -232,10 +235,10 @@ wrote this freely-distributable name-service switch implementation, using ideas from the .Tn ULTRIX -"svc.conf\*(lp5\*(rp" +svc.conf(5) and .Tn Solaris -"nsswitch.conf\*(lp4\*(rp" +nsswitch.conf(4) manual pages. The .Fx ==== //depot/projects/ia64/lib/libc/posix1e/mac.3#10 (text+ko) ==== @@ -28,14 +28,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.12 2003/04/20 04:43:56 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.13 2003/05/22 13:02:27 ru Exp $ .\" .Dd April 19, 2003 .Dt MAC 3 .Os .Sh NAME .Nm mac -.Nd Introduction to the MAC security API +.Nd introduction to the MAC security API .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/ia64/lib/libc/stdio/fputws.3#5 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 .\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp -.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.4 2003/03/09 02:56:54 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.5 2003/05/22 13:02:27 ru Exp $ .\" .Dd August 6, 2002 .Dt FPUTWS 3 @@ -63,10 +63,10 @@ function returns 0 on success and \-1 on error. .Sh ERRORS -.Bl -tag -width Er The .Fn fputws function will fail if: +.Bl -tag -width Er .It Bq Er EBADF The .Fa fp ==== //depot/projects/ia64/lib/libc/stdlib/strtod.3#7 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strtod.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.18 2003/03/12 20:31:05 das Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.19 2003/05/22 13:02:28 ru Exp $ .\" .Dd March 2, 2003 .Dt STRTOD 3 @@ -52,7 +52,7 @@ .Fn strtod "const char * restrict nptr" "char ** restrict endptr" .Ft float .Fn strtof "const char * restrict nptr" "char ** restrict endptr" -.Ft long double +.Ft "long double" .Fn strtold "const char * restrict nptr" "char ** restrict endptr" .Sh DESCRIPTION These conversion @@ -63,7 +63,7 @@ .Vt double , .Vt float , and -.Vt long double +.Vt "long double" representation, respectively. .Pp The expected form of the string is an optional plus (``+'') or minus @@ -160,10 +160,10 @@ The author of this software is .An David M. Gay . .Pp +.Bd -literal Copyright (c) 1998 by Lucent Technologies -.br All Rights Reserved -.Pp + Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all @@ -173,7 +173,7 @@ not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. -.Pp + LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY @@ -182,3 +182,4 @@ IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.Ed ==== //depot/projects/ia64/lib/libc/sys/jail.2#5 (text+ko) ==== @@ -6,13 +6,13 @@ .\"this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\"---------------------------------------------------------------------------- .\" -.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.23 2003/04/09 02:55:17 mike Exp $ +.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.24 2003/05/22 13:02:28 ru Exp $ .\" .Dd April 8, 2003 .Dt JAIL 2 .Os .Sh NAME -.Nm jail +.Nm jail , jail_attach .Nd imprison current process and future decendants .Sh LIBRARY .Lb libc @@ -59,21 +59,16 @@ .Fn jail_attach system call attaches the current process to an existing jail, identified by -.Va jid . +.Fa jid . .Sh RETURN VALUES If successful, .Fn jail returns a non-negative integer, termed the jail identifier (JID). -It returns -1 on failure, and sets +It returns \-1 on failure, and sets .Va errno to indicate the error. .Pp -If successful, -.Fn jail_attach -returns 0. -It returns -1 on failure, and sets -.Va errno -to indicate the error. +.Rv -std jail_attach .Sh PRISON? Once a process has been put in a prison, it and its decendants cannot escape the prison. ==== //depot/projects/ia64/lib/libc/sys/sendfile.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.17 2003/03/12 09:28:44 seanc Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.18 2003/05/22 13:02:28 ru Exp $ .\" .Dd November 5, 1998 .Dt SENDFILE 2 @@ -107,22 +107,22 @@ .Fn sendfile is "zero-copy", meaning that it has been optimized so that copying of the file data is avoided. .Sh TUNING -Internally this system call uses a special +Internally, this system call uses a special .Xr sendfile 2 buffer -.Pq Fa "struct sf_buf" +.Pq Vt "struct sf_buf" to handle sending file data to the client. If the sending socket is -blocking and there are not enough sendfile buffers available, +blocking, and there are not enough sendfile buffers available, .Xr sendfile 2 will block and report a state of -.Dq sfbufa . +.Dq Li sfbufa . If the sending socket is non-blocking and there are not enough sendfile buffers available, the call will block and wait for the necessary buffers to become available before finishing the call. .Pp The number of -.Fa sf_buf Ns 's +.Vt sf_buf Ns 's allocated should be proportional to the number of nmbclusters used to send data to a client via .Xr sendfile 2 . @@ -130,19 +130,21 @@ Busy installations that make extensive use of .Xr sendfile 2 may want to increase these values to be inline with their -.Ar kern.ipc.nmbclusters -.Pq see Xr tuning 7 for details . +.Va kern.ipc.nmbclusters +(see +.Xr tuning 7 +for details). .Pp The number of .Xr sendfile 2 buffers in use is determined at boot time by either the -.Em kern.ipc.nsfbufs +.Va kern.ipc.nsfbufs .Xr loader.conf 5 variable or the -.Em NSFBUFS +.Dv NSFBUFS kernel configuration tunable. The number of sendfile buffers scales with -.Em kern.maxusers . +.Va kern.maxusers . .Sh RETURN VALUES .Rv -std sendfile .Sh ERRORS @@ -198,8 +200,8 @@ .Xr open 2 , .Xr send 2 , .Xr socket 2 , -.Xr tuning 7 , -.Xr writev 2 +.Xr writev 2 , +.Xr tuning 7 .Sh HISTORY The .Fn sendfile ==== //depot/projects/ia64/lib/libc/sys/stat.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 -.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.32 2003/05/13 08:10:05 dougb Exp $ +.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.33 2003/05/22 13:02:28 ru Exp $ .\" .Dd February 15, 2002 .Dt STAT 2 @@ -90,8 +90,8 @@ The time-related fields of .Fa struct stat are as follows: -.Bl -tag -width XXXst_mtime -.It st_atime +.Bl -tag -width ".Va st_birthtime" +.It Va st_atime Time when file data last accessed. Changed by the .Xr mknod 2 , @@ -99,7 +99,7 @@ and .Xr read 2 system calls. -.It st_mtime +.It Va st_mtime Time when file data last modified. Changed by the .Xr mknod 2 , @@ -107,7 +107,7 @@ and .Xr write 2 system calls. -.It st_ctime +.It Va st_ctime Time when file status was last changed (inode data modification). Changed by the .Xr chmod 2 , @@ -120,7 +120,7 @@ and .Xr write 2 system calls. -.It st_birthtime +.It Va st_birthtime Time when the inode was created. .El .Pp ==== //depot/projects/ia64/lib/libdevstat/devstat.3#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.22 2003/03/18 13:45:08 phk Exp $ +.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.23 2003/05/22 13:02:28 ru Exp $ .\" .Dd July 15, 2001 .Dt DEVSTAT 3 @@ -40,7 +40,7 @@ .Nm devstat_selectdevs , .Nm devstat_buildmatch , .Nm devstat_compute_statistics , -.Nm devstat_compute_etime , +.Nm devstat_compute_etime .Nd device statistics utility library .Sh LIBRARY .Lb libdevstat @@ -553,7 +553,7 @@ .It DSM_MB_PER_SECOND_FREE type: long double * .Pp -The average number of megabytesper second in the specified type of +The average number of megabytes per second in the specified type of transaction between the acquisition of .Va previous and @@ -600,7 +600,7 @@ and .Va current . .It DSM_BUSY_PCT -type long double * +type: long double * .Pp The percentage of time the device had one or more transactions outstanding between the acquisition of ==== //depot/projects/ia64/lib/libfetch/fetch.3#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.52 2003/03/03 12:35:03 des Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.53 2003/05/22 13:02:28 ru Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 @@ -444,7 +444,7 @@ The accompanying error message includes a protocol-specific error code and message, e.g. "File is not available (404 Not Found)" .Sh ENVIRONMENT -.Bl -tag -width FETCH_BIND_ADDRESS +.Bl -tag -width ".Ev FETCH_BIND_ADDRESS" .It Ev FETCH_BIND_ADDRESS Specifies a hostname or IP address to which sockets used for outgoing connections will be bound. ==== //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#3 (text+ko) ==== @@ -23,27 +23,35 @@ * (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/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.5 2003/05/21 08:21:24 mtm Exp $ */ #include #include +#include #include #include #include +#include "thr_private.h" + #define MAXTHR 128 #define LDT_INDEX(x) (((long)(x) - (long)ldt_entries) / sizeof(ldt_entries[0])) -void **ldt_free = NULL; -static int ldt_inited = 0; -void *ldt_entries[MAXTHR]; +void **ldt_free = NULL; +void *ldt_entries[MAXTHR]; +static int ldt_inited = 0; +static spinlock_t ldt_lock = _SPINLOCK_INITIALIZER; static void ldt_init(void); +/* + * Initialize the array of ldt_entries and the next free slot. + * This routine must be called with the global ldt lock held. + */ static void ldt_init(void) { @@ -62,21 +70,32 @@ void _retire_thread(void *entry) { + _SPINLOCK(&ldt_lock); if (ldt_free == NULL) *(void **)entry = NULL; else *(void **)entry = *ldt_free; ldt_free = entry; + _SPINUNLOCK(&ldt_lock); } void * -_set_curthread(ucontext_t *uc, void *thr) +_set_curthread(ucontext_t *uc, struct pthread *thr) { union descriptor desc; void **ldt_entry; int ldt_index; int error; + /* + * If we are setting up the initial thread, the gs register + * won't be setup for the current thread. In any case, we + * don't need protection from re-entrancy at this point in + * the life of the program. + */ + if (thr != _thread_initial) + _SPINLOCK(&ldt_lock); + if (ldt_inited == NULL) ldt_init(); @@ -89,11 +108,14 @@ ldt_entry = ldt_free; ldt_free = (void **)*ldt_entry; + if (thr != _thread_initial) + _SPINUNLOCK(&ldt_lock); + /* * Cache the address of the thread structure here. This is * what the gs register will point to. */ - *ldt_entry = thr; + *ldt_entry = (void *)thr; ldt_index = LDT_INDEX(ldt_entry); bzero(&desc, sizeof(desc)); ==== //depot/projects/ia64/lib/libthr/thread/thr_cond.c#3 (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_cond.c,v 1.4 2003/05/15 18:17:13 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.5 2003/05/21 03:41:07 mtm Exp $ */ #include #include @@ -518,7 +518,15 @@ cond_queue_enq(pthread_cond_t cond, pthread_t pthread) { pthread_t tid = TAILQ_LAST(&cond->c_queue, cond_head); + char *name; + name = pthread->name ? pthread->name : "unknown"; + if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on condq\n", + pthread->name, pthread->uniqueid); + if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) + _thread_printf(2, "Thread (%s:%u) already on mutexq\n", + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* ==== //depot/projects/ia64/lib/libthr/thread/thr_create.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_create.c,v 1.4 2003/04/20 02:56:12 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.5 2003/05/21 03:34:54 mtm Exp $ */ #include #include @@ -200,10 +200,8 @@ * Start a garbage collector thread * if necessary. */ -#if 0 if (f_gc && pthread_create(&gc_thread,NULL, _thread_gc,NULL) != 0) PANIC("Can't create gc thread"); -#endif return (0); } ==== //depot/projects/ia64/lib/libthr/thread/thr_exit.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 22 21:04:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10AF837B404; Thu, 22 May 2003 21:04:58 -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 85D4A37B401 for ; Thu, 22 May 2003 21:04:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2358143F85 for ; Thu, 22 May 2003 21:04:57 -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 h4N44u0U009985 for ; Thu, 22 May 2003 21:04:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N44uaC009982 for perforce@freebsd.org; Thu, 22 May 2003 21:04:56 -0700 (PDT) Date: Thu, 22 May 2003 21:04:56 -0700 (PDT) Message-Id: <200305230404.h4N44uaC009982@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 31674 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: Fri, 23 May 2003 04:04:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=31674 Change 31674 by peter@peter_hammer on 2003/05/22 21:04:40 use vm_pindex_t (uint64_t) for page indexes since multi-terrabyte VM is on the way. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#13 (text+ko) ==== @@ -217,7 +217,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex); static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); @@ -246,7 +246,7 @@ /********************/ /* Return a non-clipped PD index for a given VA */ -static __inline unsigned long +static __inline vm_pindex_t pmap_pde_pindex(vm_offset_t va) { return va >> PDRSHIFT; @@ -254,28 +254,28 @@ /* Return various clipped indexes for a given VA */ -static __inline int +static __inline vm_pindex_t pmap_pte_index(vm_offset_t va) { return ((va >> PAGE_SHIFT) & ((1ul << NPTEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pde_index(vm_offset_t va) { return ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pdpe_index(vm_offset_t va) { return ((va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1)); } -static __inline int +static __inline vm_pindex_t pmap_pml4e_index(vm_offset_t va) { @@ -1185,7 +1185,7 @@ static int pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) { - unsigned long ptepindex; + vm_pindex_t ptepindex; if (va >= VM_MAXUSER_ADDRESS) return 0; @@ -1286,7 +1286,7 @@ static vm_page_t _pmap_allocpte(pmap, ptepindex) pmap_t pmap; - unsigned ptepindex; + vm_pindex_t ptepindex; { vm_page_t m, pdppg, pdpg; @@ -1314,7 +1314,7 @@ if (ptepindex >= (NUPDE + NUPDPE)) { pml4_entry_t *pml4; - unsigned pml4index; + vm_pindex_t pml4index; /* Wire up a new PDPE page */ pml4index = ptepindex - (NUPDE + NUPDPE); @@ -1322,8 +1322,8 @@ *pml4 = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } else if (ptepindex >= NUPDE) { - unsigned pml4index; - unsigned pdpindex; + vm_pindex_t pml4index; + vm_pindex_t pdpindex; pml4_entry_t *pml4; pdp_entry_t *pdp; @@ -1347,8 +1347,8 @@ *pdp = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } else { - unsigned pml4index; - unsigned pdpindex; + vm_pindex_t pml4index; + vm_pindex_t pdpindex; pml4_entry_t *pml4; pdp_entry_t *pdp; pd_entry_t *pd; @@ -1401,7 +1401,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va) { - unsigned long ptepindex; + vm_pindex_t ptepindex; pd_entry_t *pd; vm_page_t m; @@ -2158,7 +2158,7 @@ * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - unsigned ptepindex; + vm_pindex_t ptepindex; pd_entry_t *ptepa; /* @@ -2545,7 +2545,7 @@ pt_entry_t *src_pte, *dst_pte; vm_page_t dstmpte, srcmpte; pd_entry_t srcptepaddr, *pde; - unsigned ptepindex; + vm_pindex_t ptepindex; if (addr >= UPT_MIN_ADDRESS) panic("pmap_copy: invalid to pmap_copy page tables\n"); From owner-p4-projects@FreeBSD.ORG Thu May 22 21:06:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24AEC37B404; Thu, 22 May 2003 21:06: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 C642D37B401 for ; Thu, 22 May 2003 21:05:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6808A43F85 for ; Thu, 22 May 2003 21:05:59 -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 h4N45x0U010080 for ; Thu, 22 May 2003 21:05:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N45wNI010077 for perforce@freebsd.org; Thu, 22 May 2003 21:05:58 -0700 (PDT) Date: Thu, 22 May 2003 21:05:58 -0700 (PDT) Message-Id: <200305230405.h4N45wNI010077@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 31675 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: Fri, 23 May 2003 04:06:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=31675 Change 31675 by peter@peter_hammer on 2003/05/22 21:05:54 prepare for >512G vm, but dont turn it on. something is not right in _pmap_allocpte() yet Affected files ... .. //depot/projects/hammer/sys/amd64/include/pmap.h#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pmap.h#10 (text+ko) ==== @@ -104,7 +104,7 @@ #define NKPDE (NKPDPE*NPDEPG) /* number of kernel PD slots */ #define NUPML4E 1 /* number of userland PML4 pages */ -#define NUPDPE (NPDPEPG) /* number of userland PDP pages */ +#define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ #define NUPDE (NUPDPE*NPDEPG) /* number of userland PD entries */ #define NDMPML4E 1 /* number of dmap PML4 slots */ From owner-p4-projects@FreeBSD.ORG Thu May 22 21:25:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18F0937B404; Thu, 22 May 2003 21:25: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 BCD6E37B401 for ; Thu, 22 May 2003 21:25:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6112143F75 for ; Thu, 22 May 2003 21:25:23 -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 h4N4PN0U010932 for ; Thu, 22 May 2003 21:25:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N4PMhg010929 for perforce@freebsd.org; Thu, 22 May 2003 21:25:22 -0700 (PDT) Date: Thu, 22 May 2003 21:25:22 -0700 (PDT) Message-Id: <200305230425.h4N4PMhg010929@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 31677 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: Fri, 23 May 2003 04:25:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=31677 Change 31677 by peter@peter_hammer on 2003/05/22 21:24:58 hopefully expand the direct map segment in chunks of 1GB to cover all physical memory up to 512GB. That should be enough for a while. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#14 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -168,6 +168,7 @@ static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ static int nkpt; +static int ndmpdp; vm_offset_t kernel_vm_end; static u_int64_t KPTphys; /* phys addr of kernel level 1 */ @@ -365,8 +366,11 @@ KPDPphys = allocpages(NKPML4E); KPDphys = allocpages(NKPDPE); + ndmpdp = (ptoa(Maxmem) + NBPDP - 1) >> PDPSHIFT; + if (ndmpdp < 1) + ndmpdp = 1; DMPDPphys = allocpages(NDMPML4E); - DMPDphys = allocpages(NDMPDPE); + DMPDphys = allocpages(ndmpdp); /* Fill in the underlying page table pages */ /* Read-only from zero to physfree */ @@ -399,13 +403,13 @@ /* Now set up the direct map space using 2MB pages */ - for (i = 0; i < NPDEPG; i++) { + for (i = 0; i < NPDEPG * ndmpdp; i++) { ((pd_entry_t *)DMPDphys)[i] = i << PDRSHIFT; ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS; } /* And the direct map space's PDP */ - for (i = 0; i < NDMPDPE; i++) { + for (i = 0; i < ndmpdp; i++) { ((pdp_entry_t *)DMPDPphys)[i] = DMPDphys + (i << PAGE_SHIFT); ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_U; } ==== //depot/projects/hammer/sys/amd64/include/pmap.h#11 (text+ko) ==== @@ -108,7 +108,6 @@ #define NUPDE (NUPDPE*NPDEPG) /* number of userland PD entries */ #define NDMPML4E 1 /* number of dmap PML4 slots */ -#define NDMPDPE 1 /* number of dmap PDP slots */ /* * The *PDI values control the layout of virtual memory From owner-p4-projects@FreeBSD.ORG Thu May 22 22:36:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE4237B404; Thu, 22 May 2003 22:36: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 DE42F37B401 for ; Thu, 22 May 2003 22:36:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A705C43F3F for ; Thu, 22 May 2003 22:36: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 h4N5aq0U014686 for ; Thu, 22 May 2003 22:36:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N5apur014683 for perforce@freebsd.org; Thu, 22 May 2003 22:36:51 -0700 (PDT) Date: Thu, 22 May 2003 22:36:51 -0700 (PDT) Message-Id: <200305230536.h4N5apur014683@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 31682 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: Fri, 23 May 2003 05:36:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=31682 Change 31682 by peter@peter_daintree on 2003/05/22 22:35:59 IFC @31681 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#40 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#9 integrate .. //depot/projects/hammer/sys/conf/kern.mk#10 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#8 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinummemory.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#3 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#21 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.151 2003/05/22 17:25:24 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.154 2003/05/22 23:22:59 bmah Exp $ Supported Devices @@ -836,10 +836,10 @@ IBM / Adaptec ServeRAID series (ips driver) - LSI Logic Fusion/MP + LSI Logic Fusion/MP architecture Fiber Channel controllers (mpt driver) - + LSI FC909, FC929 @@ -1874,7 +1874,7 @@ Intel Pro/100 S Desktop, Server and Dual-Port Server Adapters - + On-board Ethernet NICs on many Intel motherboards. @@ -1977,16 +1977,16 @@ 3C575TX/575B/XFE575BT/575C/656/656B/656C (Cardbus) - + Dell Optiplex GX1 on-board 3C918 - + Dell On-board 3C920 - + Dell Precision on-board 3C905B - + Dell Latitude laptop docking station embedded 3C905-TX @@ -2640,73 +2640,76 @@ - PCI-Based multi-port serial boards (&man.puc.4; + PCI-Based multi-port serial boards (&man.puc.4; driver) - + Actiontech 56K PCI - + Avlab Technology, PCI IO 2S and PCI IO 4S - + Comtrol RocketPort 550 - + Decision Computers PCCOM 4-port serial and dual port RS232/422/485 - + + Diva Serial (GSP) Multiport UART (development branch only) + + Dolphin Peripherals 4025/4035/4036 - + IC Book Labs Dreadnought 16x Lite and Pro - + Lava Computers 2SP-PCI/DSerial-PCI/Quattro-PCI/Octopus-550 - + Middle Digital, Weasle serial port - + Moxa Industio CP-114, Smartio C104H-PCI and C168H/PCI - + NEC PK-UG-X001 and PK-UG-X008 - + Netmos NM9835 PCI-2S-550 - + Oxford Semiconductor OX16PCI954 PCI UART - + Syba Tech SD-LAB PCI-4S2P-550-ECP - + SIIG Cyber I/O PCI 16C550/16C650/16C850 - + SIIG Cyber 2P1S PCI 16C550/16C650/16C850 - + SIIG Cyber 2S1P PCI 16C550/16C650/16C850 - + SIIG Cyber 4S PCI 16C550/16C650/16C850 - + SIIG Cyber Serial (Single and Dual) PCI 16C550/16C650/16C850 - + Syba Tech Ltd. PCI-4S2P-550-ECP - + Titan PCI-200H and PCI-800H - + US Robotics (3Com) 3CP5609 modem - + VScom PCI-400 and PCI-800 @@ -3012,7 +3015,7 @@ linkend="bluetooth">Bluetooth section. - Host Controllers (&man.ohci.4; and &man.uhci.4; drivers) + Host Controllers (&man.ohci.4; and &man.uhci.4; drivers) ALi Aladdin-V @@ -3053,7 +3056,7 @@ VIA 83C572 USB - + UHCI or OHCI compliant motherboard chipsets (no exceptions known) ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Processors and Motherboards @@ -29,4 +29,55 @@ configurations are under active development. At this time, SMP-enabled systems are considered less stable. The current priorities are UP fixes to improve stability. + + + Supported Devices Overview + + This section contains additional information about what + devices may or may not be supported by &os;/&arch;. + + Except for the PC chipset embedded &man.ata.4; controllers, + most should work out of the box. Eventually, all + &arch;-compatible ATA controllers are expected to be fully + supported. Refer to the following sections for various disk + controllers and their current status. + + In general, PC standard serial ports + supported by the &man.sio.4; driver are expected to work on + Intel legacy machines, but not PA legacy machines. The reason + is that all devices on HP machines are memory-mapped and there + is no ISA device support other than the PCI + dictated VGA legacy. + + In addition to &man.sio.4; devices, the following devices + fail on non-Intel legacy machines (but should work on boxes with + an Intel legacy) because their drivers make ISA-specific + assumptions that do not hold: + + + + + + &man.sio.4; + No support for memory-mapped I/O + + + + &man.syscons.4; + Expect BIOS, VGA probes, etc. + + + + &man.pcm.4; + Probes MSS ISA ports ad nauseum + + + + &man.atkbd.4;, &man.psm.4; + Fixed ISA port locations + + + + + ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.569 2003/05/20 04:03:29 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.570 2003/05/23 00:02:10 bmah Exp $ 2000 @@ -897,7 +897,19 @@ 3.41. &merged; GCC has been updated to - 3.2.2 (release version). + 3.2.2 (release version). + + + GCC is known to produce + broken code with the option + set. As a workaround to avoid this problem, setting the + CPUTYPE=p4 Makefile variable (for example, in + &man.make.conf.5;) enables GCC's + option instead. This + situation is expected to be resolved when GCC 3.3 is + imported. + + The gdtoa library, for conversions between strings and floating point, has been imported. These sources ==== //depot/projects/hammer/share/man/man4/acpi.4#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/share/man/man4/acpi.4,v 1.9 2003/05/18 04:21:38 imp Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.10 2003/05/22 23:58:50 imp Exp $ .\" .Dd July 2, 2001 .Dt ACPI 4 @@ -294,8 +294,32 @@ utilities from the .Pa devel/acpicatools port, and some ACPI knowledge. +.Sh TUNABLES +.Bl -tag -width children +.It Li acpi_dsdt_load +Enables loading of a custom acpi DSDT. +.It Li acpi_dsdt_name +Name of the DSTS table to load, if loading is enabled. +.It Li debug.acpi.disable +Selectively disables portions of ACPI for debugging purposes. +.It Li hint.acpi.0.disabled +Disables all of ACPI +.It Li hw.acpi.cpu.performance_speed +Sets the speed of the CPU, if it supports multiple speeds, while in +the performance power profile. +.It Li hw.acpi.cpu.economy_speed +Sets the speed of the CPU, if it supports multiple speeds, while in +the economy power profile. +.It Li hw.acpi.ec.event_driven +Enables or disables the event driven model for the embedded controller +driver. +.It Li hw.acpi.pci.link.%d.%d.%d.irq +Override the interrupt to use. +.It Li hw.acpi.verbose +Turn on verbose debugging information about what ACPI is doing. +.El .Sh COMPATIBILITY -ACPI is only found/supported on Intel platforms (i386/IA32 and IA64). +ACPI is only found/supported on i386/ia32, ia64 and amd64. .Sh SEE ALSO .Xr loader.conf 5 , .Xr acpiconf 8 , ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#19 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.146 2003/05/15 00:23:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.147 2003/05/23 05:04:53 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#5 (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/locore.S,v 1.173 2003/05/15 00:20:17 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.174 2003/05/23 05:04:53 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#40 (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.579 2003/05/17 02:05:10 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.580 2003/05/23 05:04:53 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.107 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.108 2003/05/23 05:04:53 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.51 2003/05/12 02:44:37 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.52 2003/05/23 05:04:53 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#15 (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.407 2003/05/11 22:40:24 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.408 2003/05/23 05:04:53 peter Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#19 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.258 2003/05/22 20:09:50 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.259 2003/05/23 05:04:53 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.208 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.209 2003/05/23 05:04:54 peter Exp $ */ #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.1 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.2 2003/05/23 05:07:33 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.4 2003/05/15 00:23:39 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.5 2003/05/23 05:07:33 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#5 (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/amd64/ia32/ia32_util.h,v 1.5 2003/05/14 04:10:49 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_util.h,v 1.6 2003/05/23 05:07:33 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#4 (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_amd64.h,v 1.24 2003/05/12 02:44:37 peter Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.25 2003/05/23 05:04:54 peter Exp $ */ #ifndef _AMD64_BUS_AMD64_H_ #define _AMD64_BUS_AMD64_H_ ==== //depot/projects/hammer/sys/amd64/include/param.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.4 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.5 2003/05/23 05:04:54 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/pmap.h#12 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.101 2003/05/15 00:20:17 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.102 2003/05/23 05:04:54 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#9 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.36 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.37 2003/05/23 05:04:54 peter Exp $ */ ==== //depot/projects/hammer/sys/conf/kern.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.34 2003/05/03 18:05:56 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.35 2003/05/23 05:04:54 peter Exp $ # # Warning flags for compiling the kernel and components of the kernel. ==== //depot/projects/hammer/sys/dev/fb/vga.c#13 (text+ko) ==== @@ -26,7 +26,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/fb/vga.c,v 1.26 2003/05/02 01:36:27 marcel Exp $ + * $FreeBSD: src/sys/dev/fb/vga.c,v 1.27 2003/05/23 05:10:49 peter Exp $ */ #include "opt_vga.h" ==== //depot/projects/hammer/sys/dev/vinum/vinum.c#5 (text+ko) ==== @@ -35,17 +35,17 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinum.c,v 1.42 2003/05/04 05:25:14 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.58 2003/05/05 05:28:15 grog Exp $ + * $Id: vinum.c,v 1.44 2003/05/23 00:50:55 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.59 2003/05/23 01:12:16 grog Exp $ */ -#define STATIC static /* nothing while we're testing XXX */ +#define STATIC static /* nothing while we're testing */ #include #include /* for sync(2) */ #ifdef VINUMDEBUG #include -int debug = 0; +int debug = 0; /* debug flags */ extern int total_malloced; extern int malloccount; extern struct mc malloced[]; @@ -78,6 +78,15 @@ static eventhandler_tag dev_clone_tag; /* + * Mutexes for plex synchronization. Ideally each plex + * should have its own mutex, but the fact that the plex + * struct can move makes that very complicated. Instead, + * have plexes use share these mutexes based on modulo plex + * number. + */ +struct mtx plexmutex[PLEXMUTEXES]; + +/* * Called by main() during pseudo-device attachment. All we need * to do is allocate enough space for devices to be configured later, and * add devsw entries. @@ -86,6 +95,12 @@ vinumattach(void *dummy) { char *envp; + int i; +#define MUTEXNAMELEN 16 + char mutexname[MUTEXNAMELEN]; +#if PLEXMUTEXES > 10000 +#error Increase size of MUTEXNAMELEN +#endif /* modload should prevent multiple loads, so this is worth a panic */ if ((vinum_conf.flags & VF_LOADED) != 0) panic("vinum: already loaded"); @@ -136,6 +151,11 @@ vinum_conf.plexes_allocated = INITIAL_PLEXES; /* number of plex slots allocated */ vinum_conf.plexes_used = 0; /* and number in use */ + for (i = 0; i < PLEXMUTEXES; i++) { + snprintf(mutexname, MUTEXNAMELEN, "vinumplex%d", i); + mtx_init(&plexmutex[i], mutexname, "plex", MTX_DEF); + } + /* and subdisks */ SD = (struct sd *) Malloc(sizeof(struct sd) * INITIAL_SUBDISKS); CHECKALLOC(SD, "vinum: no memory\n"); @@ -250,6 +270,7 @@ { struct sync_args dummyarg = {0}; + int i; switch (type) { case MOD_LOAD: @@ -291,6 +312,8 @@ #endif destroy_dev(vinum_daemon_dev); /* daemon device */ destroy_dev(vinum_super_dev); + for (i = 0; i < PLEXMUTEXES; i++) + mtx_destroy(&plexmutex[i]); log(LOG_INFO, "vinum: unloaded\n"); /* tell the world */ return 0; default: ==== //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#6 (text+ko) ==== @@ -33,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumconfig.c,v 1.39 2003/05/04 05:22:46 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.57 2003/05/05 08:42:42 grog Exp $ + * $Id: vinumconfig.c,v 1.41 2003/05/23 00:57:34 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.58 2003/05/23 01:13:10 grog Exp $ */ #define STATIC static @@ -106,7 +106,7 @@ } else { retval = kvprintf(msg, NULL, (void *) text, 10, ap); text[retval] = '\0'; /* delimit */ - strcpy(ioctl_reply->msg, text); + strlcpy(ioctl_reply->msg, text, sizeof(ioctl_reply->msg)); ioctl_reply->error = error; /* first byte is the error number */ Free(text); } @@ -477,7 +477,7 @@ } /* - * Find the named drive in vinum_conf.drive, return a pointer + * Find the named drive in vinum_conf.drive, * return the index in vinum_conf.drive. * Don't mark the drive as allocated (XXX SMP) * If create != 0, create an entry if it doesn't exist @@ -505,10 +505,9 @@ driveno = get_empty_drive(); drive = &DRIVE[driveno]; if (name != NULL) - bcopy(name, /* put in its name */ - drive->label.name, - min(sizeof(drive->label.name), - strlen(name))); + strlcpy(drive->label.name, /* put in its name */ + name, + sizeof(drive->label.name)); drive->state = drive_referenced; /* in use, nothing worthwhile there */ return driveno; /* return the index */ } @@ -819,8 +818,6 @@ Free(plex->sdnos); if (plex->lock) Free(plex->lock); - if (isstriped(plex)) - mtx_destroy(&plex->lockmtx); destroy_dev(plex->dev); bzero(plex, sizeof(struct plex)); /* and clear it out */ plex->state = plex_unallocated; @@ -1042,10 +1039,11 @@ } /* - * Handle a subdisk definition. We store the information in the global variable - * sd, so we don't need to allocate. + * Handle a subdisk definition. We store the + * information in the global variable sd, so we + * don't need to allocate. * - * If we find an error, print a message and return + * On error throw a message back to the caller. */ void config_subdisk(int update) @@ -1201,6 +1199,9 @@ if (sd->driveno < 0) /* no current drive? */ throw_rude_remark(EINVAL, "Subdisk %s is not associated with a drive", sd->name); } + if (DRIVE[sd->driveno].state != drive_up) + sd->state = sd_crashed; + /* * This is tacky. If something goes wrong * with the checks, we may end up losing drive @@ -1225,11 +1226,13 @@ /* Do we have a plex name? */ if (sdindex >= 0) /* we have a plex */ - strcpy(sd->name, PLEX[sd->plexno].name); /* take it from there */ + strlcpy(sd->name, /* take it from there */ + PLEX[sd->plexno].name, + sizeof(sd->name)); else /* no way */ throw_rude_remark(EINVAL, "Unnamed sd is not associated with a plex"); sprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */ - strcat(sd->name, sdsuffix); /* and add it to the name */ + strlcat(sd->name, sdsuffix, sizeof(sd->name)); /* and add it to the name */ } /* do we have complete info for this subdisk? */ if (sd->sectors < 0) @@ -1434,19 +1437,20 @@ char plexsuffix[8]; /* form plex name suffix here */ /* Do we have a volume name? */ if (plex->volno >= 0) /* we have a volume */ - strcpy(plex->name, /* take it from there */ - VOL[plex->volno].name); + strlcpy(plex->name, /* take it from there */ + VOL[plex->volno].name, + sizeof(plex->name)); else /* no way */ throw_rude_remark(EINVAL, "Unnamed plex is not associated with a volume"); sprintf(plexsuffix, ".p%d", pindex); /* form the suffix */ - strcat(plex->name, plexsuffix); /* and add it to the name */ + strlcat(plex->name, plexsuffix, sizeof(plex->name)); /* and add it to the name */ } if (isstriped(plex)) { plex->lock = (struct rangelock *) Malloc(PLEX_LOCKS * sizeof(struct rangelock)); CHECKALLOC(plex->lock, "vinum: Can't allocate lock table\n"); bzero((char *) plex->lock, PLEX_LOCKS * sizeof(struct rangelock)); - mtx_init(&plex->lockmtx, plex->name, "plex", MTX_DEF); + plex->lockmtx = &plexmutex[plexno % PLEXMUTEXES]; /* use this mutex for locking */ } /* Note the last plex we configured */ current_plex = plexno; @@ -2025,7 +2029,7 @@ } void -update_volume_config(int volno, int diskconfig) +update_volume_config(int volno) { struct volume *vol = &VOL[volno]; struct plex *plex; @@ -2082,7 +2086,7 @@ if (VOL[volno].state > volume_uninit) { VOL[volno].flags &= ~VF_CONFIG_SETUPSTATE; /* no more setupstate */ update_volume_state(volno); - update_volume_config(volno, diskconfig); + update_volume_config(volno); } } save_config(); ==== //depot/projects/hammer/sys/dev/vinum/vinumext.h#6 (text+ko) ==== @@ -33,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumext.h,v 1.31 2003/04/25 08:01:37 grog Exp $ - * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.39 2003/05/05 07:50:15 grog Exp $ + * $Id: vinumext.h,v 1.33 2003/05/23 00:57:48 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.40 2003/05/23 01:13:43 grog Exp $ */ /* vinumext.h: external definitions */ @@ -42,6 +42,7 @@ /* *sigh* We still need this at the moment. */ #ifdef _KERNEL extern struct _vinum_conf vinum_conf; /* configuration information */ +extern struct mtx plexmutex[]; /* mutexes for plexes to use */ #else extern struct __vinum_conf vinum_conf; /* configuration information */ #endif @@ -102,7 +103,7 @@ void updateconfig(int); void update_sd_config(int sdno, int kernelstate); void update_plex_config(int plexno, int kernelstate); -void update_volume_config(int volno, int kernelstate); +void update_volume_config(int volno); void update_config(void); void drive_io_done(struct buf *); void save_config(void); @@ -159,7 +160,11 @@ char *basename(char *); #endif +#ifdef VINUMDEBUG +void expand_table(void **, int, int, char *, int); +#else void expand_table(void **, int, int); +#endif struct disklabel; struct request; ==== //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#8 (text+ko) ==== @@ -41,8 +41,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.22 2003/05/07 03:31:45 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.46 2003/05/08 00:36:20 grog Exp $ + * $Id: vinumioctl.c,v 1.23 2003/05/23 01:02:22 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.47 2003/05/23 01:14:13 grog Exp $ */ #include @@ -721,6 +721,8 @@ set_plex_state(plex->plexno, plex_down, setstate_force | setstate_configuring); + if (plex->volno >= 0) /* plex attached to volume, */ + update_volume_config(plex->volno); save_config(); reply->error = 0; } @@ -783,7 +785,7 @@ bcopy("ex-", plex->name, 3); plex->name[MAXPLEXNAME - 1] = '\0'; } - update_volume_config(volno, 0); + update_volume_config(volno); save_config(); reply->error = 0; } else { @@ -856,7 +858,7 @@ vol = validvol(msg->index, reply); if (vol) { bcopy(msg->newname, vol->name, MAXVOLNAME); - update_volume_config(msg->index, 0); + update_volume_config(msg->index); save_config(); reply->error = 0; } ==== //depot/projects/hammer/sys/dev/vinum/vinumlock.c#4 (text+ko) ==== @@ -37,8 +37,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumlock.c,v 1.17 2003/02/02 05:07:51 grog Exp $ - * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.25 2003/05/05 05:35:52 grog Exp $ + * $Id: vinumlock.c,v 1.19 2003/05/23 01:07:18 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.26 2003/05/23 01:14:35 grog Exp $ */ #include @@ -132,11 +132,11 @@ * increment all addresses by 1. */ stripe++; - mtx_lock(&plex->lockmtx); + mtx_lock(plex->lockmtx); /* Wait here if the table is full */ while (plex->usedlocks == PLEX_LOCKS) /* all in use */ - msleep(&plex->usedlocks, &plex->lockmtx, PRIBIO, "vlock", 0); + msleep(&plex->usedlocks, plex->lockmtx, PRIBIO, "vlock", 0); #ifdef DIAGNOSTIC if (plex->usedlocks >= PLEX_LOCKS) @@ -164,7 +164,7 @@ } #endif plex->lockwaits++; /* waited one more time */ - msleep(lock, &plex->lockmtx, PRIBIO, "vrlock", 0); + msleep(lock, plex->lockmtx, PRIBIO, "vrlock", 0); lock = &plex->lock[-1]; /* start again */ foundlocks = 0; pos = NULL; @@ -188,7 +188,7 @@ pos->stripe = stripe; pos->bp = bp; plex->usedlocks++; /* one more lock */ - mtx_unlock(&plex->lockmtx); + mtx_unlock(plex->lockmtx); #ifdef VINUMDEBUG if (debug & DEBUG_LOCKREQS) { struct rangelockinfo lockinfo; ==== //depot/projects/hammer/sys/dev/vinum/vinummemory.c#4 (text+ko) ==== @@ -33,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinummemory.c,v 1.30 2003/04/28 02:54:43 grog Exp $ - * $FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.32 2003/05/01 01:32:08 grog Exp $ + * $Id: vinummemory.c,v 1.31 2003/05/23 01:08:36 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.33 2003/05/23 01:15:01 grog Exp $ */ #include @@ -104,27 +104,40 @@ return ++f; /* skip the / */ } +#ifdef VINUMDEBUG +void +expand_table(void **table, int oldsize, int newsize, char *file, int line) +#else void expand_table(void **table, int oldsize, int newsize) +#endif { if (newsize > oldsize) { int *temp; int s; s = splhigh(); +#ifdef VINUMDEBUG + temp = (int *) MMalloc(newsize, file, line); /* allocate a new table */ +#else temp = (int *) Malloc(newsize); /* allocate a new table */ +#endif CHECKALLOC(temp, "vinum: Can't expand table\n"); bzero((char *) temp, newsize); /* clean it all out */ if (*table != NULL) { /* already something there, */ bcopy((char *) *table, (char *) temp, oldsize); /* copy it to the old table */ +#ifdef VINUMDEBUG + FFree(*table, file, line); +#else Free(*table); +#endif } *table = temp; splx(s); } } -#ifdef VINUMDEBUG /* XXX debug */ +#ifdef VINUMDEBUG #define MALLOCENTRIES 16384 int malloccount = 0; int highwater = 0; /* highest index ever allocated */ @@ -172,8 +185,7 @@ malloced[i].size = size; malloced[i].line = line; malloced[i].address = result; - bcopy(f, malloced[i].file, min(strlen(f), MCFILENAMELEN - 1)); - malloced[i].file[MCFILENAMELEN - 1] = '\0'; + strlcpy(malloced[i].file, f, MCFILENAMELEN); } if (malloccount > highwater) highwater = malloccount; @@ -208,8 +220,7 @@ freeinfo[lastfree].size = malloced[i].size; freeinfo[lastfree].line = line; freeinfo[lastfree].address = mem; - bcopy(f, freeinfo[lastfree].file, min(strlen(f), MCFILENAMELEN - 1)); - freeinfo[lastfree].file[MCFILENAMELEN - 1] = '\0'; + bcopy(f, freeinfo[lastfree].file, MCFILENAMELEN); if (++lastfree == FREECOUNT) lastfree = 0; } @@ -251,7 +262,7 @@ m->size = malloced[ent].size; m->line = malloced[ent].line; m->seq = malloced[ent].seq; - bcopy(malloced[ent].file, m->file, MCFILENAMELEN); + strlcpy(m->file, malloced[ent].file, MCFILENAMELEN); return 0; } ==== //depot/projects/hammer/sys/dev/vinum/vinumobj.h#3 (text+ko) ==== @@ -37,8 +37,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 22 23:02:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9068137B404; Thu, 22 May 2003 23:02: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 47B4737B401 for ; Thu, 22 May 2003 23:02:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D422D43FA3 for ; Thu, 22 May 2003 23:02:34 -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 h4N62Y0U017734 for ; Thu, 22 May 2003 23:02:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N62Yf2017731 for perforce@freebsd.org; Thu, 22 May 2003 23:02:34 -0700 (PDT) Date: Thu, 22 May 2003 23:02:34 -0700 (PDT) Message-Id: <200305230602.h4N62Yf2017731@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 31684 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: Fri, 23 May 2003 06:02:36 -0000 X-List-Received-Date: Fri, 23 May 2003 06:02:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=31684 Change 31684 by peter@peter_overcee on 2003/05/22 23:01:36 vendor sync Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#16 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -639,7 +639,6 @@ * Low level helper routines..... ***************************************************/ - #if defined(PMAP_DIAGNOSTIC) /* From owner-p4-projects@FreeBSD.ORG Thu May 22 23:02:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACE2E37B401; Thu, 22 May 2003 23:02:36 -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 C029A37B405 for ; Thu, 22 May 2003 23:02:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5609643FA3 for ; Thu, 22 May 2003 23:02:35 -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 h4N62Z0U017740 for ; Thu, 22 May 2003 23:02:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N62YhW017737 for perforce@freebsd.org; Thu, 22 May 2003 23:02:35 -0700 (PDT) Date: Thu, 22 May 2003 23:02:35 -0700 (PDT) Message-Id: <200305230602.h4N62YhW017737@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 31685 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: Fri, 23 May 2003 06:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=31685 Change 31685 by peter@peter_overcee on 2003/05/22 23:01:57 remove stray commented out printf Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#20 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#20 (text+ko) ==== @@ -174,7 +174,6 @@ } #endif -/* printf("trap: rip %p, addr %p\n", (void *)frame.tf_rip, (void *)frame.tf_addr); */ if ((frame.tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled From owner-p4-projects@FreeBSD.ORG Thu May 22 23:04:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 442E937B404; Thu, 22 May 2003 23:04:39 -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 CEF5F37B401 for ; Thu, 22 May 2003 23:04:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7703E43F3F for ; Thu, 22 May 2003 23:04:38 -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 h4N64c0U018749 for ; Thu, 22 May 2003 23:04:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N64c4F018746 for perforce@freebsd.org; Thu, 22 May 2003 23:04:38 -0700 (PDT) Date: Thu, 22 May 2003 23:04:38 -0700 (PDT) Message-Id: <200305230604.h4N64c4F018746@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 31686 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: Fri, 23 May 2003 06:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=31686 Change 31686 by peter@peter_overcee on 2003/05/22 23:04:01 This was rather bogus. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#9 edit .. //depot/projects/hammer/sys/amd64/conf/GENERIC#13 edit .. //depot/projects/hammer/sys/conf/options.amd64#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#9 (text+ko) ==== @@ -98,6 +98,7 @@ char *brand; cpu_class = amd64_cpus[cpu].cpu_class; + printf("CPU: "); strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ @@ -148,10 +149,6 @@ if (*brand != '\0') strcpy(cpu_model, brand); -#ifdef NDA - printf("CPU: %s AMD64 Class Processor\n", cpu_vendor); -#else - printf("CPU: "); printf("%s (", cpu_model); switch(cpu_class) { case CPUCLASS_K8: @@ -165,7 +162,6 @@ printf("Unknown"); /* will panic below... */ } printf("-class CPU)\n"); -#endif if(*cpu_vendor) printf(" Origin = \"%s\"",cpu_vendor); if(cpu_id) ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#13 (text+ko) ==== @@ -22,7 +22,6 @@ cpu HAMMER ident GENERIC maxusers 0 -options NDA #Avoid accidental cut/paste of NDA'ed stuff options IA32 options COMPAT_FREEBSD4 ==== //depot/projects/hammer/sys/conf/options.amd64#11 (text+ko) ==== @@ -54,7 +54,6 @@ # EOF # ------------------------------- HAMMER opt_cpu.h -NDA opt_cpu.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h PSM_HOOKRESUME opt_psm.h From owner-p4-projects@FreeBSD.ORG Thu May 22 23:16:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83B9D37B405; Thu, 22 May 2003 23:16: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 33A5637B404 for ; Thu, 22 May 2003 23:16:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D458543F3F for ; Thu, 22 May 2003 23:16:53 -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 h4N6Gr0U019281 for ; Thu, 22 May 2003 23:16:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N6Gron019278 for perforce@freebsd.org; Thu, 22 May 2003 23:16:53 -0700 (PDT) Date: Thu, 22 May 2003 23:16:53 -0700 (PDT) Message-Id: <200305230616.h4N6Gron019278@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 31688 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: Fri, 23 May 2003 06:16:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=31688 Change 31688 by peter@peter_hammer on 2003/05/22 23:16:36 add some comments Affected files ... .. //depot/projects/hammer/sys/amd64/include/pmap.h#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pmap.h#13 (text+ko) ==== @@ -114,10 +114,10 @@ */ #define PML4PML4I (NPML4EPG/2) /* Index of recursive pml4 mapping */ -#define KPML4I (NPML4EPG-1) -#define DMPML4I (KPML4I-1) +#define KPML4I (NPML4EPG-1) /* Top 512GB for KVM */ +#define DMPML4I (KPML4I-1) /* Next 512GB down for direct map */ -#define KPDPI (NPDPEPG-1) +#define KPDPI (NPDPEPG-1) /* kernbase at -1GB */ /* * XXX doesn't really belong here I guess... From owner-p4-projects@FreeBSD.ORG Thu May 22 23:29:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1505737B401; Thu, 22 May 2003 23:29:10 -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 A027D37B40A for ; Thu, 22 May 2003 23:29:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3540543F3F for ; Thu, 22 May 2003 23:29:09 -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 h4N6T90U019702 for ; Thu, 22 May 2003 23:29:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N6T86V019699 for perforce@freebsd.org; Thu, 22 May 2003 23:29:08 -0700 (PDT) Date: Thu, 22 May 2003 23:29:08 -0700 (PDT) Message-Id: <200305230629.h4N6T86V019699@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 31689 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: Fri, 23 May 2003 06:29:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=31689 Change 31689 by peter@peter_hammer on 2003/05/22 23:28:15 As suggested by the gdb folks, pad struct fpreg to 512 bytes to match the fxsave format (as is done on linux and netbsd apparently). Affected files ... .. //depot/projects/hammer/sys/amd64/include/reg.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/reg.h#6 (text+ko) ==== @@ -80,6 +80,7 @@ unsigned long fpr_env[4]; unsigned char fpr_acc[8][16]; unsigned char fpr_xacc[16][16]; + unsigned long fpr_spare[12]; }; struct dbreg { From owner-p4-projects@FreeBSD.ORG Fri May 23 13:49:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4A6437B404; Fri, 23 May 2003 13:49: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 8024337B401 for ; Fri, 23 May 2003 13:49:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 331CA43FBD for ; Fri, 23 May 2003 13:49:23 -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 h4NKnN0U087826 for ; Fri, 23 May 2003 13:49:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4NKnMkS087823 for perforce@freebsd.org; Fri, 23 May 2003 13:49:22 -0700 (PDT) Date: Fri, 23 May 2003 13:49:22 -0700 (PDT) Message-Id: <200305232049.h4NKnMkS087823@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 31725 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: Fri, 23 May 2003 20:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=31725 Change 31725 by peter@peter_daintree on 2003/05/23 13:48:39 IFC @31722 Affected files ... .. //depot/projects/hammer/lib/libthr/Makefile#2 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_autoinit.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#3 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/release.dsl#4 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#8 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#10 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#18 integrate Differences ... ==== //depot/projects/hammer/lib/libthr/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.2 2003/04/01 07:07:38 jeff Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.3 2003/05/23 09:48:20 mtm 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 @@ -20,6 +20,8 @@ AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes +WARNS?= 2 + .include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#4 (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/arch/i386/i386/_setcurthread.c,v 1.5 2003/05/21 08:21:24 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include @@ -31,6 +31,8 @@ #include #include +#include +#include #include #include @@ -48,6 +50,9 @@ static void ldt_init(void); +/* in _curthread.S */ +extern void _set_gs(int); + /* * Initialize the array of ldt_entries and the next free slot. * This routine must be called with the global ldt lock held. ==== //depot/projects/hammer/lib/libthr/thread/thr_autoinit.c#2 (text+ko) ==== @@ -30,9 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.1 2003/04/01 03:46:28 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ +#include + +#include "thr_private.h" + /* * This module uses GCC extentions to initialize the * threads package at program start-up time. ==== //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#3 (text+ko) ==== @@ -1,9 +1,10 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.3 2003/05/15 17:56:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.4 2003/05/23 09:48:20 mtm Exp $ */ #include #include +#include #include "thr_private.h" /* ==== //depot/projects/hammer/lib/libthr/thread/thr_create.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_create.c,v 1.5 2003/05/21 03:34:54 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include #include @@ -62,7 +62,6 @@ _pthread_create(pthread_t * thread, const pthread_attr_t * attr, void *(*start_routine) (void *), void *arg) { - struct itimerval itimer; int f_gc = 0; int ret = 0; pthread_t gc_thread; ==== //depot/projects/hammer/lib/libthr/thread/thr_detach.c#2 (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_detach.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.3 2003/05/23 09:48:20 mtm Exp $ */ #include #include +#include #include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); ==== //depot/projects/hammer/lib/libthr/thread/thr_exit.c#3 (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.3 2003/05/21 03:29:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.5 2003/05/23 09:48:20 mtm Exp $ */ #include #include @@ -42,6 +42,9 @@ __weak_reference(_pthread_exit, pthread_exit); +/* thr_exit() */ +extern int _thr_exit(void); + void _thread_exit(char *fname, int lineno, char *string) { @@ -173,7 +176,7 @@ /* If we're the last thread, call it quits */ if (TAILQ_EMPTY(&_thread_list)) - exit(curthread->ret); + exit(0); /* * Retire the architecture specific id so that it can be used for ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#3 (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_init.c,v 1.4 2003/05/21 03:22:36 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.5 2003/05/23 09:48:20 mtm Exp $ */ /* Allocate space for global thread variables here: */ @@ -158,7 +158,6 @@ { struct pthread *pthread; int fd; - int flags; int i; size_t len; int mib[2]; @@ -328,7 +327,7 @@ /* Initialise the garbage collector mutex and condition variable. */ if (_pthread_mutex_init(&_gc_mutex,NULL) != 0 || - pthread_cond_init(&_gc_cond,NULL) != 0) + _pthread_cond_init(&_gc_cond,NULL) != 0) PANIC("Failed to initialise garbage collector mutex or condvar"); } ==== //depot/projects/hammer/lib/libthr/thread/thr_kern.c#4 (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.5 2003/05/12 10:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.7 2003/05/23 10:28:13 mtm Exp $ */ #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -72,27 +73,18 @@ errno); abort(); } - - restore = sav; + curthread->savedsig = sav; } void _thread_critical_exit(pthread_t pthread) { sigset_t set; - int error; - - /* - * restore is protected by giant. We could restore our signal state - * incorrectly if someone else set restore between unlocking giant - * and restoring the signal mask. To avoid this we cache a copy prior - * to the unlock. - */ - set = restore; /* * Restore signals. */ + set = curthread->savedsig; if (__sys_sigprocmask(SIG_SETMASK, &set, NULL)) { _thread_printf(STDERR_FILENO, "Critical Exit: sig err %d\n", errno); ==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.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_mutex.c,v 1.7 2003/05/21 03:41:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.8 2003/05/23 09:48:20 mtm Exp $ */ #include #include @@ -64,6 +64,7 @@ */ static int get_muncontested(pthread_mutex_t, int); static void get_mcontested(pthread_mutex_t); +static int mutex_lock_common(pthread_mutex_t *, int); static inline int mutex_self_trylock(pthread_mutex_t); static inline int mutex_self_lock(pthread_mutex_t); static inline int mutex_unlock_common(pthread_mutex_t *, int); @@ -1381,13 +1382,14 @@ static int get_muncontested(pthread_mutex_t mutexp, int nonblock) { - if (mutexp->m_owner != NULL && mutexp->m_owner != curthread) + if (mutexp->m_owner != NULL && mutexp->m_owner != curthread) { return (-1); - else if (mutexp->m_owner == curthread) + } else if (mutexp->m_owner == curthread) { if (nonblock) return (mutex_self_trylock(mutexp)); else return (mutex_self_lock(mutexp)); + } /* * The mutex belongs to this thread now. Mark it as ==== //depot/projects/hammer/lib/libthr/thread/thr_printf.c#2 (text+ko) ==== @@ -23,17 +23,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.1 2003/04/01 03:46:29 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.1 2003/04/01 03:46:29 jeff Exp $"); +__FBSDID("$FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.2 2003/05/23 09:48:20 mtm Exp $"); #include #include #include #include #include +#include #include #include ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.6 2003/05/12 10:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.8 2003/05/23 10:28:13 mtm Exp $ */ #ifndef _THR_PRIVATE_H @@ -425,6 +425,7 @@ char *name; u_int64_t uniqueid; /* for gdb */ thr_id_t thr_id; + sigset_t savedsig; /* * Lock for accesses to this thread structure. @@ -718,7 +719,7 @@ void _thread_cleanupspecific(void); void _thread_dump_info(void); void _thread_init(void); -void _thread_sig_wrapper(int sig, siginfo_t *info, ucontext_t *context); +void _thread_sig_wrapper(int sig, siginfo_t *info, void *context); void _thread_printf(int fd, const char *, ...); void _thread_start(void); void _thread_seterrno(pthread_t, int); ==== //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#2 (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_resume_np.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_resume_np.c,v 1.3 2003/05/23 09:48:20 mtm Exp $ */ #include #include +#include #include "thr_private.h" static void resume_common(struct pthread *); ==== //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#2 (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_setschedparam.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_setschedparam.c,v 1.4 2003/05/23 09:48:20 mtm Exp $ */ #include #include @@ -42,7 +42,10 @@ _pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param) { - int old_prio, in_readyq = 0, ret = 0; + int old_prio, ret = 0; +#if 0 + int in_readyq = 0; +#endif if ((param == NULL) || (policy < SCHED_FIFO) || (policy > SCHED_RR)) return (EINVAL); ==== //depot/projects/hammer/lib/libthr/thread/thr_sig.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.5 2003/05/12 10:50:18 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.6 2003/05/23 09:48:20 mtm Exp $ */ #include @@ -113,7 +113,7 @@ * User thread signal handler wrapper. */ void -_thread_sig_wrapper(int sig, siginfo_t *info, ucontext_t *context) +_thread_sig_wrapper(int sig, siginfo_t *info, void *context) { struct pthread_state_data psd; __siginfohandler_t *handler; @@ -149,7 +149,7 @@ GIANT_UNLOCK(curthread); handler = (__siginfohandler_t *) _thread_sigact[sig - 1].sa_handler; - handler(sig, info, context); + handler(sig, info, (ucontext_t *)context); GIANT_LOCK(curthread); } ==== //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * 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_syscalls.c,v 1.1 2003/04/01 03:46:29 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.2 2003/05/23 09:48:20 mtm Exp $ */ /* @@ -90,6 +90,16 @@ #include "thr_private.h" +extern int __creat(const char *, mode_t); +extern int __sleep(unsigned int); +extern int __sys_nanosleep(const struct timespec *, struct timespec *); +extern int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); +extern int __system(const char *); +extern int __tcdrain(int); +extern pid_t __wait(int *); +extern pid_t _wait4(pid_t, int *, int, struct rusage *); +extern pid_t __waitpid(pid_t, int *, int); + __weak_reference(_aio_suspend, aio_suspend); int ==== //depot/projects/hammer/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#4 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -15,6 +15,9 @@ + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -53,36 +56,8 @@ (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org")) (literal "de-bsd-translators@de.FreeBSD.org")) (literal ">.")))))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - - (define %refentry-xref-link% #t) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Processors and Motherboards @@ -65,4 +65,31 @@ work around hardware bugs or other oddities. When in doubt, a search of the archives of the &a.mobile; may be useful. + Most modern laptops (as well as many desktops) use the + Advanced Configuration and Power Management (ACPI) standard. &os; + supports ACPI via the ACPI Component Architecture reference + implementation from Intel, as described in the &man.acpi.4; manual + page. The use of ACPI causes instabilities on some machines and it + may be necessary to disable the ACPI driver, which is normally + loaded via a kernel module. This may be accomplished by adding + the following line to /boot/device.hints: + + hint.acpi.0.disabled="1" + + Users debugging ACPI-related problems may find it useful to + disable portions of the ACPI functionality. The &man.acpi.4; + manual page has more information on how to do this via loader + tunables. + + ACPI depends on a Differentiated System Descriptor Table + (DSDT) provided by each machine's BIOS. Some machines have bad or + incomplete DSDTs, which prevents ACPI from functioning correctly. + Replacement DSDTs for some machines can be found at the DSDT + section of the ACPI4Linux project Web + site. &os; can use these DSDTs to override the DSDT provided by + the BIOS; see the &man.acpi.4; manual page for more + information. + ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.570 2003/05/23 00:02:10 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.571 2003/05/23 20:10:46 bmah Exp $ 2000 @@ -814,10 +814,19 @@ The libkse library, providing POSIX threading support using KSE, is now enabled and - installed by default. It is still considered a + installed by default. + This library currently supports M:N threading. Both process and + system scope threads are supported, as well as getting/setting + the concurrency level. By default, the library sets the + concurrency level to the number of CPUs in the system. Each + concurrency level correlates to a KSE, and all process scope + threads run in these KSEs. Each system scope thread gets its + own KSE in addition to those corresponding to concurrency levels. + libkse is still considered a work-in-progress, and is not used by default. However, it can be used as a replacement for the libc_r - thread library. + thread library, by substituting instead of + when linking programs. A 1:1 threading package (where for every pthread in an application there is one KSE and thread) has been implemented. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -11,6 +11,9 @@ + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -49,36 +52,8 @@ (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) (literal "doc@FreeBSD.org")) (literal ">.")))))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - - (define %refentry-xref-link% #t) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - ==== //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#4 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD French Documentation Project $Id$ - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.5 2002/10/19 16:26:33 gioria Exp $ + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.6 2003/05/23 10:30:27 hrs Exp $ Original revision: 1.6 --> @@ -18,6 +18,9 @@ + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -56,36 +59,8 @@ (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) (literal "doc@FreeBSD.org")) (literal ">.")))))) - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - - (define %refentry-xref-link% #t) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - ==== //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/release.dsl#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + + (define %refentry-xref-link% #t) + (define ($email-footer$) (make sequence (make element gi: "p" @@ -55,37 +58,7 @@ (create-link (list (list "HREF" "http://www.jp.FreeBSD.org/ml.html#doc-jp")) (literal "doc-jp@jp.FreeBSD.org")) (literal "> ¤Þ¤ÇÅŻҥ᡼¥ë¤Ç¤ª´ê¤¤¤·¤Þ¤¹¡£")))))) - - - - (element quote - (make sequence - (literal "``") - (process-children) - (literal "''"))) - - - (define %refentry-xref-link% #t) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0")) - (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) - (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) - (else (string-append u "&" "manpath=FreeBSD+5.0-current"))))) ]]> - - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - ==== //depot/projects/hammer/release/doc/share/sgml/release.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -6,6 +6,8 @@ + +%release.ent; ]> @@ -111,11 +113,35 @@ (define %callout-graphics% ;; Use graphics in callouts? #f) + + + (element quote + (make sequence + (literal "``") + (process-children) + (literal "''"))) + + + (define ($create-refentry-xref-link$ #!optional (n (current-node))) + (let* ((r (select-elements (children n) (normalize "refentrytitle"))) + (m (select-elements (children n) (normalize "manvolnum"))) + (v (attribute-string (normalize "vendor") n)) + (u (string-append "&release.man.url;?query=" + (data r) "&" "sektion=" (data m)))) + (case v + (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" )) + (("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;")) + (("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;")) + (else (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd;"))))) ]]> + (define (toc-depth nd) + (if (string=? (gi nd) (normalize "book")) + 3 + 3)) + - ==== //depot/projects/hammer/release/doc/share/sgml/release.ent#4 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -37,6 +37,13 @@ + + + + + + +