From owner-p4-projects Sun Jan 5 12:31:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1780C37B405; Sun, 5 Jan 2003 12:31:39 -0800 (PST) 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 BC40A37B401 for ; Sun, 5 Jan 2003 12:31:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F43D43EE6 for ; Sun, 5 Jan 2003 12:31:38 -0800 (PST) (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 h05KVcfh077769 for ; Sun, 5 Jan 2003 12:31:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h05KVbaZ077766 for perforce@freebsd.org; Sun, 5 Jan 2003 12:31:37 -0800 (PST) Date: Sun, 5 Jan 2003 12:31:37 -0800 (PST) Message-Id: <200301052031.h05KVbaZ077766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23208 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23208 Change 23208 by marcel@marcel_nfs on 2003/01/05 12:31:11 Diff reduction. Affected files ... .. //depot/projects/ia64/sys/ia64/include/dig64.h#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/dig64.h#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$ + * $FreeBSD: src/sys/ia64/include/dig64.h,v 1.1 2002/12/18 18:52:20 marcel Exp $ */ #ifndef _MACHINE_DIG64_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 14: 2:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E87A037B401; Sun, 5 Jan 2003 14:02:35 -0800 (PST) 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 7FA6237B401 for ; Sun, 5 Jan 2003 14:02:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2285A43EC5 for ; Sun, 5 Jan 2003 14:02:35 -0800 (PST) (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 h05M2Yfh011039 for ; Sun, 5 Jan 2003 14:02:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h05M2Ysh011036 for perforce@freebsd.org; Sun, 5 Jan 2003 14:02:34 -0800 (PST) Date: Sun, 5 Jan 2003 14:02:34 -0800 (PST) Message-Id: <200301052202.h05M2Ysh011036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23217 Change 23217 by marcel@marcel_nfs on 2003/01/05 14:02:07 Bump the count to its maximum (a vector is 8 bits). Affected files ... .. //depot/projects/ia64/sys/ia64/include/intrcnt.h#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/intrcnt.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ #define INTRCNT_ISA_IRQ (INTRCNT_CLOCK + 1) #define INTRCNT_ISA_IRQ_LEN 16 #define INTRCNT_OTHER_BASE (INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN) -#define INTRCNT_OTHER_LEN 112 +#define INTRCNT_OTHER_LEN 240 #define INTRCNT_COUNT (INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN) /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 14:37:23 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A9237B405; Sun, 5 Jan 2003 14:37:21 -0800 (PST) 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 37E8937B401 for ; Sun, 5 Jan 2003 14:37:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E415E43EDC for ; Sun, 5 Jan 2003 14:37:20 -0800 (PST) (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 h05MbKfh022271 for ; Sun, 5 Jan 2003 14:37:20 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h05MbKFx022268 for perforce@freebsd.org; Sun, 5 Jan 2003 14:37:20 -0800 (PST) Date: Sun, 5 Jan 2003 14:37:20 -0800 (PST) Message-Id: <200301052237.h05MbKFx022268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23222 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23222 Change 23222 by marcel@marcel_nfs on 2003/01/05 14:36:52 Relocate the *.apic sysctl from hw to machdep. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#18 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#18 (text+ko) ==== @@ -41,10 +41,10 @@ static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); -static int sysctl_hw_apic(SYSCTL_HANDLER_ARGS); +static int sysctl_machdep_apic(SYSCTL_HANDLER_ARGS); -SYSCTL_OID(_hw, OID_AUTO, apic, CTLTYPE_STRING|CTLFLAG_RD, - NULL, 0, sysctl_hw_apic, "A", "(x)APIC redirection table entries"); +SYSCTL_OID(_machdep, OID_AUTO, apic, CTLTYPE_STRING|CTLFLAG_RD, + NULL, 0, sysctl_machdep_apic, "A", "(x)APIC redirection table entries"); struct sapic *ia64_sapics[16]; /* XXX make this resizable */ int ia64_sapic_count; @@ -161,7 +161,7 @@ } static int -sysctl_hw_apic(SYSCTL_HANDLER_ARGS) +sysctl_machdep_apic(SYSCTL_HANDLER_ARGS) { char buf[80]; struct sapic_rte rte; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 17:58: 1 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E1BF37B405; Sun, 5 Jan 2003 17:57:37 -0800 (PST) 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 EA04137B401 for ; Sun, 5 Jan 2003 17:57:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09F4243EB2 for ; Sun, 5 Jan 2003 17:57:36 -0800 (PST) (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 h061vZfh094547 for ; Sun, 5 Jan 2003 17:57:35 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h061vZpW094544 for perforce@freebsd.org; Sun, 5 Jan 2003 17:57:35 -0800 (PST) Date: Sun, 5 Jan 2003 17:57:35 -0800 (PST) Message-Id: <200301060157.h061vZpW094544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23237 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23237 Change 23237 by marcel@marcel_vaio on 2003/01/05 17:57:04 IFC @23235 Affected files ... .. //depot/projects/ia64/contrib/lukemftpd/src/Makefile#1 branch .. //depot/projects/ia64/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/extern.h#5 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.conf.5#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpusers.5#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/ia64/etc/periodic/daily/470.status-named#4 integrate .. //depot/projects/ia64/etc/periodic/security/800.loginfail#5 integrate .. //depot/projects/ia64/etc/periodic/security/900.tcpwrap#3 integrate .. //depot/projects/ia64/lib/Makefile#17 integrate .. //depot/projects/ia64/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/_setjmp.S#5 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/setjmp.S#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/sigsetjmp.S#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/tdelete.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/tfind.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/twalk.c#3 integrate .. //depot/projects/ia64/lib/libc_r/arch/sparc64/_atomic_lock.S#1 branch .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#15 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_create.c#8 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#9 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#33 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/hw.ent#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/Makefile#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#1 branch .. //depot/projects/ia64/sbin/ipfw/ipfw.8#15 integrate .. //depot/projects/ia64/share/man/man4/Makefile#30 integrate .. //depot/projects/ia64/share/man/man4/lmc.4#1 branch .. //depot/projects/ia64/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/ia64/sys/dev/wi/wi_hostap.c#13 integrate .. //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#13 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#23 integrate .. //depot/projects/ia64/sys/ia64/ia64/locore.s#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#26 integrate .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#19 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#7 integrate .. //depot/projects/ia64/sys/ia64/include/clock.h#7 integrate .. //depot/projects/ia64/sys/ia64/include/cpufunc.h#9 integrate .. //depot/projects/ia64/sys/ia64/include/intr.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/intrcnt.h#5 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#34 integrate .. //depot/projects/ia64/sys/net/if_stf.c#11 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#19 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#16 integrate .. //depot/projects/ia64/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/elf.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cache.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#30 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tlb.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#15 integrate .. //depot/projects/ia64/sys/sys/imgact_elf.h#7 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#33 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#25 integrate .. //depot/projects/ia64/usr.sbin/Makefile#28 integrate Differences ... ==== //depot/projects/ia64/contrib/lukemftpd/src/cmds.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.16 2002/02/13 15:15:23 lukem Exp $ */ +/* $NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $ */ /* * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -98,7 +98,30 @@ * SUCH DAMAGE. */ -#include "lukemftpd.h" + +#include +#ifndef lint +__RCSID("$NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $"); +#endif /* not lint */ + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef KERBEROS5 +#include +#endif #include "extern.h" @@ -307,11 +330,11 @@ *ep++ = '\0'; c = lookup(cmdtab, command); if (c == NULL) { - reply(502, "Unknown command %s.", command); + reply(502, "Unknown command '%s'.", command); return; } if (! CMD_IMPLEMENTED(c)) { - reply(501, "%s command not implemented.", c->name); + reply(502, "%s command not implemented.", c->name); return; } if (! CMD_HAS_OPTIONS(c)) { @@ -484,12 +507,14 @@ { FILE *fin; int c; + int atstart; char *argv[] = { INTERNAL_LS, "-lgA", "", NULL }; argv[2] = (char *)filename; fin = ftpd_popen(argv, "r", STDOUT_FILENO); reply(-211, "status of %s:", filename); /* XXX: use fgetln() or fparseln() here? */ + atstart = 1; while ((c = getc(fin)) != EOF) { if (c == '\n') { if (ferror(stdout)){ @@ -505,7 +530,10 @@ } CPUTC('\r', stdout); } + if (atstart && isdigit(c)) + CPUTC(' ', stdout); CPUTC(c, stdout); + atstart = (c == '\n'); } (void) ftpd_pclose(fin); reply(211, "End of Status"); ==== //depot/projects/ia64/contrib/lukemftpd/src/conf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.46 2001/12/04 13:54:12 lukem Exp $ */ +/* $NetBSD: conf.c,v 1.50 2002/11/16 03:10:34 itojun Exp $ */ /*- * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. @@ -36,7 +36,35 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "lukemftpd.h" +#include +#ifndef lint +__RCSID("$NetBSD: conf.c,v 1.50 2002/11/16 03:10:34 itojun Exp $"); +#endif /* not lint */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef KERBEROS5 +#include +#endif #include "extern.h" #include "pathnames.h" @@ -91,6 +119,11 @@ curclass.timeout = DEFAULT_TIMEOUT; /* curclass.type is set elsewhere */ curclass.umask = DEFAULT_UMASK; + curclass.mmapsize = 0; + curclass.readsize = 0; + curclass.writesize = 0; + curclass.sendbufsize = 0; + curclass.sendlowat = 0; CURCLASS_FLAGS_SET(checkportcmd); CURCLASS_FLAGS_CLR(denyquick); @@ -113,11 +146,10 @@ size_t len; LLT llval; int none, match; - char *endp; + char *endp, errbuf[100]; char *class, *word, *arg, *template; const char *infile; size_t line; - unsigned int timeout; struct ftpconv *conv, *cnext; init_curclass(); @@ -136,7 +168,7 @@ template = NULL; for (; (buf = fparseln(f, &len, &line, NULL, FPARSELN_UNESCCOMM | - FPARSELN_UNESCCONT | FPARSELN_UNESCESC)) != NULL; + FPARSELN_UNESCCONT | FPARSELN_UNESCESC)) != NULL; free(buf)) { none = match = 0; p = buf; @@ -160,24 +192,37 @@ strcasecmp(class, "all") == 0) ) continue; -#define CONF_FLAG(x) \ - do { \ - if (none || \ - (!EMPTYSTR(arg) && strcasecmp(arg, "off") == 0)) \ - CURCLASS_FLAGS_CLR(x); \ - else \ - CURCLASS_FLAGS_SET(x); \ +#define CONF_FLAG(Field) \ + do { \ + if (none || \ + (!EMPTYSTR(arg) && strcasecmp(arg, "off") == 0)) \ + CURCLASS_FLAGS_CLR(Field); \ + else \ + CURCLASS_FLAGS_SET(Field); \ } while (0) -#define CONF_STRING(x) \ - do { \ - if (none || EMPTYSTR(arg)) \ - arg = NULL; \ - else \ - arg = xstrdup(arg); \ - REASSIGN(curclass.x, arg); \ +#define CONF_STRING(Field) \ + do { \ + if (none || EMPTYSTR(arg)) \ + arg = NULL; \ + else \ + arg = xstrdup(arg); \ + REASSIGN(curclass.Field, arg); \ } while (0) +#define CONF_LL(Field,Arg,Min,Max) \ + do { \ + if (none || EMPTYSTR(Arg)) \ + goto nextline; \ + llval = strsuftollx(#Field, Arg, Min, Max, \ + errbuf, sizeof(errbuf)); \ + if (errbuf[0]) { \ + syslog(LOG_WARNING, "%s line %d: %s", \ + infile, (int)line, errbuf); \ + goto nextline; \ + } \ + curclass.Field = llval; \ + } while(0) if (0) { /* no-op */ @@ -314,61 +359,40 @@ CONF_STRING(homedir); } else if (strcasecmp(word, "limit") == 0) { - int limit; - curclass.limit = DEFAULT_LIMIT; REASSIGN(curclass.limitfile, NULL); - if (none || EMPTYSTR(arg)) - continue; - limit = (int)strtol(arg, &endp, 10); - if (*endp != 0) { - syslog(LOG_WARNING, - "%s line %d: invalid limit %s", - infile, (int)line, arg); - continue; - } - curclass.limit = limit; + CONF_LL(limit, arg, -1, LLTMAX); REASSIGN(curclass.limitfile, EMPTYSTR(p) ? NULL : xstrdup(p)); } else if (strcasecmp(word, "maxfilesize") == 0) { curclass.maxfilesize = DEFAULT_MAXFILESIZE; - if (none || EMPTYSTR(arg)) - continue; - llval = strsuftoll(arg); - if (llval == -1) { - syslog(LOG_WARNING, - "%s line %d: invalid maxfilesize %s", - infile, (int)line, arg); - continue; - } - curclass.maxfilesize = llval; + CONF_LL(maxfilesize, arg, -1, LLTMAX); } else if (strcasecmp(word, "maxtimeout") == 0) { curclass.maxtimeout = DEFAULT_MAXTIMEOUT; - if (none || EMPTYSTR(arg)) - continue; - timeout = (unsigned int)strtoul(arg, &endp, 10); - if (*endp != 0) { - syslog(LOG_WARNING, - "%s line %d: invalid maxtimeout %s", - infile, (int)line, arg); - continue; - } - if (timeout < 30) { - syslog(LOG_WARNING, - "%s line %d: maxtimeout %d < 30 seconds", - infile, (int)line, timeout); - continue; - } - if (timeout < curclass.timeout) { - syslog(LOG_WARNING, - "%s line %d: maxtimeout %d < timeout (%d)", - infile, (int)line, timeout, - curclass.timeout); - continue; - } - curclass.maxtimeout = timeout; + CONF_LL(maxtimeout, arg, + MIN(30, curclass.timeout), LLTMAX); + + } else if (strcasecmp(word, "mmapsize") == 0) { + curclass.mmapsize = 0; + CONF_LL(mmapsize, arg, 0, LLTMAX); + + } else if (strcasecmp(word, "readsize") == 0) { + curclass.readsize = 0; + CONF_LL(readsize, arg, 0, LLTMAX); + + } else if (strcasecmp(word, "writesize") == 0) { + curclass.writesize = 0; + CONF_LL(writesize, arg, 0, LLTMAX); + + } else if (strcasecmp(word, "sendbufsize") == 0) { + curclass.sendbufsize = 0; + CONF_LL(sendbufsize, arg, 0, LLTMAX); + + } else if (strcasecmp(word, "sendlowat") == 0) { + curclass.sendlowat = 0; + CONF_LL(sendlowat, arg, 0, LLTMAX); } else if (strcasecmp(word, "modify") == 0) { CONF_FLAG(modify); @@ -383,107 +407,60 @@ CONF_FLAG(passive); } else if (strcasecmp(word, "portrange") == 0) { - int minport, maxport; - char *min, *max; + long minport, maxport; curclass.portmin = 0; curclass.portmax = 0; if (none || EMPTYSTR(arg)) continue; - min = arg; - NEXTWORD(p, max); - if (EMPTYSTR(max)) { + if (EMPTYSTR(p)) { syslog(LOG_WARNING, "%s line %d: missing maxport argument", infile, (int)line); continue; } - minport = (int)strtol(min, &endp, 10); - if (*endp != 0 || minport < IPPORT_RESERVED || - minport > IPPORT_ANONMAX) { - syslog(LOG_WARNING, - "%s line %d: invalid minport %s", - infile, (int)line, min); + minport = strsuftollx("minport", arg, IPPORT_RESERVED, + IPPORT_ANONMAX, errbuf, sizeof(errbuf)); + if (errbuf[0]) { + syslog(LOG_WARNING, "%s line %d: %s", + infile, (int)line, errbuf); continue; } - maxport = (int)strtol(max, &endp, 10); - if (*endp != 0 || maxport < IPPORT_RESERVED || - maxport > IPPORT_ANONMAX) { - syslog(LOG_WARNING, - "%s line %d: invalid maxport %s", - infile, (int)line, max); + maxport = strsuftollx("maxport", p, IPPORT_RESERVED, + IPPORT_ANONMAX, errbuf, sizeof(errbuf)); + if (errbuf[0]) { + syslog(LOG_WARNING, "%s line %d: %s", + infile, (int)line, errbuf); continue; } if (minport >= maxport) { syslog(LOG_WARNING, - "%s line %d: minport %d >= maxport %d", + "%s line %d: minport %ld >= maxport %ld", infile, (int)line, minport, maxport); continue; } - curclass.portmin = minport; - curclass.portmax = maxport; + curclass.portmin = (int)minport; + curclass.portmax = (int)maxport; } else if (strcasecmp(word, "private") == 0) { CONF_FLAG(private); } else if (strcasecmp(word, "rateget") == 0) { - curclass.maxrateget = 0; - curclass.rateget = 0; - if (none || EMPTYSTR(arg)) - continue; - llval = strsuftoll(arg); - if (llval == -1) { - syslog(LOG_WARNING, - "%s line %d: invalid rateget %s", - infile, (int)line, arg); - continue; - } - curclass.maxrateget = llval; - curclass.rateget = llval; + curclass.maxrateget = curclass.rateget = 0; + CONF_LL(rateget, arg, 0, LLTMAX); + curclass.maxrateget = curclass.rateget; } else if (strcasecmp(word, "rateput") == 0) { - curclass.maxrateput = 0; - curclass.rateput = 0; - if (none || EMPTYSTR(arg)) - continue; - llval = strsuftoll(arg); - if (llval == -1) { - syslog(LOG_WARNING, - "%s line %d: invalid rateput %s", - infile, (int)line, arg); - continue; - } - curclass.maxrateput = llval; - curclass.rateput = llval; + curclass.maxrateput = curclass.rateput = 0; + CONF_LL(rateput, arg, 0, LLTMAX); + curclass.maxrateput = curclass.rateput; } else if (strcasecmp(word, "sanenames") == 0) { CONF_FLAG(sanenames); } else if (strcasecmp(word, "timeout") == 0) { curclass.timeout = DEFAULT_TIMEOUT; - if (none || EMPTYSTR(arg)) - continue; - timeout = (unsigned int)strtoul(arg, &endp, 10); - if (*endp != 0) { - syslog(LOG_WARNING, - "%s line %d: invalid timeout %s", - infile, (int)line, arg); - continue; - } - if (timeout < 30) { - syslog(LOG_WARNING, - "%s line %d: timeout %d < 30 seconds", - infile, (int)line, timeout); - continue; - } - if (timeout > curclass.maxtimeout) { - syslog(LOG_WARNING, - "%s line %d: timeout %d > maxtimeout (%d)", - infile, (int)line, timeout, - curclass.maxtimeout); - continue; - } - curclass.timeout = timeout; + CONF_LL(timeout, arg, 30, curclass.maxtimeout); } else if (strcasecmp(word, "template") == 0) { if (none) @@ -491,19 +468,22 @@ REASSIGN(template, EMPTYSTR(arg) ? NULL : xstrdup(arg)); } else if (strcasecmp(word, "umask") == 0) { - mode_t fumask; + u_long fumask; curclass.umask = DEFAULT_UMASK; if (none || EMPTYSTR(arg)) continue; - fumask = (mode_t)strtoul(arg, &endp, 8); - if (*endp != 0 || fumask > 0777) { + errno = 0; + endp = NULL; + fumask = strtoul(arg, &endp, 8); + if (errno || *arg == '\0' || *endp != '\0' || + fumask > 0777) { syslog(LOG_WARNING, "%s line %d: invalid umask %s", infile, (int)line, arg); continue; } - curclass.umask = fumask; + curclass.umask = (mode_t)fumask; } else if (strcasecmp(word, "upload") == 0) { CONF_FLAG(upload); @@ -516,6 +496,8 @@ infile, (int)line, word); continue; } + nextline: + ; } REASSIGN(template, NULL); fclose(f); @@ -578,7 +560,7 @@ return; memset(&gl, 0, sizeof(gl)); - if (glob(curclass.notify, GLOB_LIMIT, NULL, &gl) != 0 + if (glob(curclass.notify, GLOB_BRACE|GLOB_LIMIT, NULL, &gl) != 0 || gl.gl_matchc == 0) { globfree(&gl); return; @@ -669,8 +651,8 @@ cprintf(stdout, "unlimited"); lastnum = 0; } else { - cprintf(stdout, "%d", - curclass.limit); + cprintf(stdout, LLF, + (LLT)curclass.limit); lastnum = curclass.limit; } break; @@ -891,51 +873,6 @@ } /* - * Convert the string `arg' to a long long, which may have an optional SI suffix - * (`b', `k', `m', `g', `t'). Returns the number for success, -1 otherwise. - */ -LLT -strsuftoll(const char *arg) -{ - char *cp; - LLT val; - - if (!isdigit((unsigned char)arg[0])) - return (-1); - - val = STRTOLL(arg, &cp, 10); - if (cp != NULL) { - if (cp[0] != '\0' && cp[1] != '\0') - return (-1); - switch (tolower((unsigned char)cp[0])) { - case '\0': - case 'b': - break; - case 'k': - val <<= 10; - break; - case 'm': - val <<= 20; - break; - case 'g': - val <<= 30; - break; -#ifndef NO_LONG_LONG - case 't': - val <<= 40; - break; -#endif - default: - return (-1); - } - } - if (val < 0) - return (-1); - - return (val); -} - -/* * Count the number of current connections, reading from * /var/run/ftpd.pids- * Does a kill -0 on each pid in that file, and only counts @@ -959,15 +896,8 @@ if ((fd = open(fn, O_RDWR | O_CREAT, 0600)) == -1) return; -#if HAVE_LOCKF if (lockf(fd, F_TLOCK, 0) == -1) goto cleanup_count; -#elif HAVE_FLOCK - if (flock(fd, LOCK_EX | LOCK_NB) != 0) - goto cleanup_count; -#else - /* XXX: use fcntl ? */ -#endif if (fstat(fd, &sb) == -1) goto cleanup_count; if ((pids = malloc(sb.st_size + sizeof(pid_t))) == NULL) @@ -1005,14 +935,8 @@ (void)ftruncate(fd, count); cleanup_count: -#if HAVE_LOCKF if (lseek(fd, 0, SEEK_SET) != -1) (void)lockf(fd, F_ULOCK, 0); -#elif HAVE_FLOCK - (void)flock(fd, LOCK_UN); -#else - /* XXX: use fcntl ? */ -#endif close(fd); REASSIGN(pids, NULL); } ==== //depot/projects/ia64/contrib/lukemftpd/src/extern.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.43 2001/12/04 13:54:12 lukem Exp $ */ +/* $NetBSD: extern.h,v 1.44 2002/05/30 00:24:47 enami Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -108,16 +108,9 @@ # define ULLFP(x) "%" x "lu" # define ULLT unsigned long # define STRTOLL(x,y,z) strtol(x,y,z) +# define LLTMIN LONG_MIN +# define LLTMAX LONG_MAX #else -#if HAVE_PRINTF_QD -# define LLF "%qd" -# define LLFP(x) "%" x "qd" -# define LLT long long -# define ULLF "%qu" -# define ULLFP(x) "%" x "qu" -# define ULLT unsigned long long -# define STRTOLL(x,y,z) strtoll(x,y,z) -#else # define LLF "%lld" # define LLFP(x) "%" x "lld" # define LLT long long @@ -125,7 +118,8 @@ # define ULLFP(x) "%" x "llu" # define ULLT unsigned long long # define STRTOLL(x,y,z) strtoll(x,y,z) -#endif +# define LLTMIN LLONG_MIN +# define LLTMAX LLONG_MAX #endif #define FTP_BUFLEN 512 @@ -137,7 +131,7 @@ char **copyblk(char **); void count_users(void); void cprintf(FILE *, const char *, ...) - ; + __attribute__((__format__(__printf__, 2, 3))); void cwd(const char *); FILE *dataconn(const char *, off_t, const char *); void delete(const char *); @@ -177,7 +171,7 @@ void renamecmd(const char *, const char *); char *renamefrom(const char *); void reply(int, const char *, ...) - ; + __attribute__((__format__(__printf__, 2, 3))); void retrieve(char *[], const char *); void send_file_list(const char *); void show_chdir_messages(int); @@ -186,7 +180,6 @@ void statfilecmd(const char *); void statxfer(void); void store(const char *, const char *, int); -LLT strsuftoll(const char *); void user(const char *); char *xstrdup(const char *); void yyerror(char *); @@ -271,24 +264,29 @@ char *display; /* File to display upon chdir */ char *homedir; /* Directory to chdir(2) to at login */ classflag_t flags; /* Flags; see classflag_t above */ - int limit; /* Max connections (-1 = unlimited) */ + LLT limit; /* Max connections (-1 = unlimited) */ char *limitfile; /* File to display if limit reached */ LLT maxfilesize; /* Maximum file size of uploads */ LLT maxrateget; /* Maximum get transfer rate throttle */ LLT maxrateput; /* Maximum put transfer rate throttle */ - unsigned int maxtimeout; /* Maximum permitted timeout */ + LLT maxtimeout; /* Maximum permitted timeout */ char *motd; /* MotD file to display after login */ char *notify; /* Files to notify about upon chdir */ - int portmin; /* Minumum port for passive mode */ - int portmax; /* Maximum port for passive mode */ + LLT portmin; /* Minumum port for passive mode */ + LLT portmax; /* Maximum port for passive mode */ LLT rateget; /* Get (RETR) transfer rate throttle */ LLT rateput; /* Put (STOR) transfer rate throttle */ - unsigned int timeout; /* Default timeout */ + LLT timeout; /* Default timeout */ class_ft type; /* Class type */ mode_t umask; /* Umask to use */ + LLT mmapsize; /* mmap window size */ + LLT readsize; /* data read size */ + LLT writesize; /* data write size */ + LLT sendbufsize; /* SO_SNDBUF size */ + LLT sendlowat; /* SO_SNDLOWAT size */ }; -extern void ftp_loop(void); +extern void ftp_loop(void) __attribute__ ((noreturn)); extern void ftp_handle_line(char *); #ifndef GLOBAL @@ -355,8 +353,8 @@ } while (0); #define CURCLASSTYPE curclass.type == CLASS_GUEST ? "GUEST" : \ - curclass.type == CLASS_CHROOT ? "CHROOT" : \ - curclass.type == CLASS_REAL ? "REAL" : \ + curclass.type == CLASS_CHROOT ? "CHROOT" : \ + curclass.type == CLASS_REAL ? "REAL" : \ "" #define ISDOTDIR(x) (x[0] == '.' && x[1] == '\0') ==== //depot/projects/ia64/contrib/lukemftpd/src/ftpcmd.y#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $NetBSD: ftpcmd.y,v 1.66 2001/12/01 10:25:30 lukem Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $ */ /*- - * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. + * Copyright (c) 1997-2002 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -77,7 +77,41 @@ */ %{ -#include "lukemftpd.h" +#include + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; +#else +__RCSID("$NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $"); +#endif +#endif /* not lint */ + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef KERBEROS5 +#include +#endif #include "extern.h" #include "version.h" @@ -93,7 +127,10 @@ %} %union { - int i; + struct { + off_t o; + int i; + } u; char *s; } @@ -128,10 +165,10 @@ %token STRING %token ALL -%token NUMBER +%token NUMBER -%type check_login octal_number byte_size -%type struct_code mode_code type_code form_code decimal_integer +%type check_login octal_number byte_size +%type struct_code mode_code type_code form_code decimal_integer %type pathstring pathname password username %type mechanism_name base64data prot_code @@ -259,32 +296,48 @@ | LPSV check_login CRLF { if ($2) { - if (epsvall) - reply(501, - "LPSV disallowed after EPSV ALL"); - else - long_passive("LPSV", PF_UNSPEC); + if (CURCLASS_FLAGS_ISSET(passive)) { + if (epsvall) + reply(501, + "LPSV disallowed after EPSV ALL"); + else + long_passive("LPSV", PF_UNSPEC); + } else + reply(500, "LPSV mode not available."); } } | EPSV check_login SP NUMBER CRLF { - if ($2) - long_passive("EPSV", epsvproto2af($4)); + if ($2) { + if (CURCLASS_FLAGS_ISSET(passive)) + long_passive("EPSV", + epsvproto2af($4.i)); + else + reply(500, "EPSV mode not available."); + } } | EPSV check_login SP ALL CRLF { if ($2) { - reply(200, "EPSV ALL command successful."); - epsvall++; + if (CURCLASS_FLAGS_ISSET(passive)) { + reply(200, + "EPSV ALL command successful."); + epsvall++; + } else + reply(500, "EPSV mode not available."); } } | EPSV check_login CRLF { - if ($2) - long_passive("EPSV", PF_UNSPEC); + if ($2) { + if (CURCLASS_FLAGS_ISSET(passive)) + long_passive("EPSV", PF_UNSPEC); + else + reply(500, "EPSV mode not available."); + } } | TYPE check_login SP type_code CRLF @@ -517,24 +570,28 @@ { if ($4) { reply(200, - "Current IDLE time limit is %d seconds; max %d", - curclass.timeout, curclass.maxtimeout); + "Current IDLE time limit is " LLF + " seconds; max " LLF, + (LLT)curclass.timeout, + (LLT)curclass.maxtimeout); } } | SITE SP IDLE check_login SP NUMBER CRLF { if ($4) { - if ($6 < 30 || $6 > curclass.maxtimeout) { + if ($6.i < 30 || $6.i > curclass.maxtimeout) { reply(501, - "IDLE time limit must be between 30 and %d seconds", - curclass.maxtimeout); + "IDLE time limit must be between 30 and " + LLF " seconds", + (LLT)curclass.maxtimeout); } else { - curclass.timeout = $6; + curclass.timeout = $6.i; (void) alarm(curclass.timeout); reply(200, - "IDLE time limit set to %d seconds", - curclass.timeout); + "IDLE time limit set to " + LLF " seconds", + (LLT)curclass.timeout); } } } @@ -550,19 +607,17 @@ | SITE SP RATEGET check_login SP STRING CRLF { + char errbuf[100]; char *p = $6; LLT rate; if ($4) { - rate = strsuftoll(p); - if (rate == -1) - reply(501, "Invalid RATEGET %s", p); - else if (curclass.maxrateget && - rate > curclass.maxrateget) - reply(501, - "RATEGET " LLF " is larger than maximum RATEGET " LLF, - (LLT)rate, - (LLT)curclass.maxrateget); + rate = strsuftollx("RATEGET", p, 0, + curclass.maxrateget + ? curclass.maxrateget + : LLTMAX, errbuf, sizeof(errbuf)); + if (errbuf[0]) + reply(501, "%s", errbuf); else { curclass.rateget = rate; reply(200, @@ -584,19 +639,17 @@ | SITE SP RATEPUT check_login SP STRING CRLF { + char errbuf[100]; char *p = $6; LLT rate; if ($4) { - rate = strsuftoll(p); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 18: 2:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC5B637B405; Sun, 5 Jan 2003 18:02:43 -0800 (PST) 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 6B95A37B401 for ; Sun, 5 Jan 2003 18:02:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13DCF43EC5 for ; Sun, 5 Jan 2003 18:02:43 -0800 (PST) (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 h0622gfh097955 for ; Sun, 5 Jan 2003 18:02:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0622gx3097951 for perforce@freebsd.org; Sun, 5 Jan 2003 18:02:42 -0800 (PST) Date: Sun, 5 Jan 2003 18:02:42 -0800 (PST) Message-Id: <200301060202.h0622gx3097951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23238 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23238 Change 23238 by peter@peter_itanic2 on 2003/01/05 18:02:34 Add some warning/error knobs for catching the evilness of assigning integers to pointers, either implicitly or through stupidity. I've turned this on in /etc/make.conf on my test boxes. It isn't pretty. CFLAGS= -O -pipe -Werror-bad-pointer-cast COPTFLAGS= -O -pipe -Werror-bad-pointer-cast The first test here is probably harmless. There is no need to get upset about trying to store a pointer in an integer, eg: for hashing bits. Affected files ... .. //depot/projects/ia64/contrib/gcc/c-decl.c#9 edit .. //depot/projects/ia64/contrib/gcc/c-tree.h#6 edit .. //depot/projects/ia64/contrib/gcc/c-typeck.c#6 edit Differences ... ==== //depot/projects/ia64/contrib/gcc/c-decl.c#9 (text+ko) ==== @@ -349,6 +349,11 @@ int mesg_implicit_function_declaration = -1; +/* Nonzero means message about casts with integer/pointer size mismatches; + 1 means warning; 2 means error. */ + +int mesg_bad_pointer_cast = 1; + /* Nonzero means give string constants the type `const char *' to get extra warnings from them. These warnings will be too numerous to be useful, except in thoroughly ANSIfied programs. */ @@ -658,6 +663,12 @@ mesg_implicit_function_declaration = 1; else if (!strcmp (p, "-Wno-implicit-function-declaration")) mesg_implicit_function_declaration = 0; + else if (!strcmp (p, "-Werror-bad-pointer-cast")) + mesg_bad_pointer_cast = 2; + else if (!strcmp (p, "-Wbad-pointer-cast")) + mesg_bad_pointer_cast = 1; + else if (!strcmp (p, "-Wno-bad-pointer-cast")) + mesg_bad_pointer_cast = 0; else if (!strcmp (p, "-Wimplicit-int")) warn_implicit_int = 1; else if (!strcmp (p, "-Wno-implicit-int")) ==== //depot/projects/ia64/contrib/gcc/c-tree.h#6 (text+ko) ==== @@ -371,6 +371,9 @@ /* Warn about implicit declarations. 1 = warning, 2 = error. */ extern int mesg_implicit_function_declaration; +/* Warn about bad pointer casts. 1 = warning, 2 = error. */ +extern int mesg_bad_pointer_cast; + /* In c-decl.c */ extern void finish_incomplete_decl PARAMS ((tree)); ==== //depot/projects/ia64/contrib/gcc/c-typeck.c#6 (text+ko) ==== @@ -3767,7 +3767,16 @@ && TREE_CODE (otype) == POINTER_TYPE && TYPE_PRECISION (type) != TYPE_PRECISION (otype) && !TREE_CONSTANT (value)) +#if 1 /* mostly harmless */ warning ("cast from pointer to integer of different size"); +#else + { + if (mesg_bad_pointer_cast == 2) + error ("cast from pointer to integer of different size"); + else if (mesg_bad_pointer_cast == 1) + warning ("cast from pointer to integer of different size"); + } +#endif if (warn_bad_function_cast && TREE_CODE (value) == CALL_EXPR @@ -3779,7 +3788,12 @@ && TYPE_PRECISION (type) != TYPE_PRECISION (otype) /* Don't warn about converting any constant. */ && !TREE_CONSTANT (value)) - warning ("cast to pointer from integer of different size"); + { + if (mesg_bad_pointer_cast == 2) + error ("cast to pointer from integer of different size"); + else if (mesg_bad_pointer_cast == 1) + warning ("cast to pointer from integer of different size"); + } ovalue = value; value = convert (type, value); @@ -4243,8 +4257,11 @@ && TREE_CODE (TREE_OPERAND (rhs, 0)) == INTEGER_CST && integer_zerop (TREE_OPERAND (rhs, 0)))) { - warn_for_assignment ("%s makes pointer from integer without a cast", - errtype, funname, parmnum); + if (mesg_bad_pointer_cast == 2) + error ("%s makes pointer from integer without a cast", errtype); + else + warn_for_assignment ("%s makes pointer from integer without a cast", + errtype, funname, parmnum); return convert (type, rhs); } return null_pointer_node; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 18:28:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0E337B405; Sun, 5 Jan 2003 18:28:18 -0800 (PST) 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 01CF437B401 for ; Sun, 5 Jan 2003 18:28:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 558C943EB2 for ; Sun, 5 Jan 2003 18:28:17 -0800 (PST) (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 h062SHfh005553 for ; Sun, 5 Jan 2003 18:28:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h062SGXI005550 for perforce@freebsd.org; Sun, 5 Jan 2003 18:28:16 -0800 (PST) Date: Sun, 5 Jan 2003 18:28:16 -0800 (PST) Message-Id: <200301060228.h062SGXI005550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23242 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23242 Change 23242 by marcel@marcel_vaio on 2003/01/05 18:27:23 IFC @23240 Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#20 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#17 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.31 2003/01/06 01:39:24 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.33 2003/01/06 02:09:08 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -123,21 +123,19 @@ intrcnt[INTRCNT_CLOCK]++; #endif critical_enter(); + /* Rearm so we get the next clock interrupt */ + ia64_set_itm(ia64_get_itc() + itm_reload); #ifdef SMP clks[PCPU_GET(cpuid)]++; /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif - /* XXX don't reload ITM based on ITC. */ - ia64_set_itm(ia64_get_itc() + itm_reload); hardclock((struct clockframe *)framep); /* divide hz (1024) by 8 to get stathz (128) */ if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); #ifdef SMP } else { - /* XXX don't reload ITM based on ITC. */ - ia64_set_itm(ia64_get_itc() + itm_reload); mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#20 (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/ia64/ia64/sapic.c,v 1.11 2003/01/05 22:14:30 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.12 2003/01/06 02:09:08 marcel Exp $ */ #include "opt_ddb.h" ==== //depot/projects/ia64/sys/pci/if_xl.c#17 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.117 2003/01/06 00:46:03 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.118 2003/01/06 01:55:12 silby Exp $"); #include #include @@ -1307,7 +1307,7 @@ sc->xl_flags = 0; if (pci_get_device(dev) == TC_DEVICEID_HURRICANE_555) - sc->xl_flags |= XL_FLAG_EEPROM_OFFSET | XL_FLAG_PHYOK; + sc->xl_flags |= XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_PHYOK; if (pci_get_device(dev) == TC_DEVICEID_HURRICANE_556 || pci_get_device(dev) == TC_DEVICEID_HURRICANE_556B) sc->xl_flags |= XL_FLAG_FUNCREG | XL_FLAG_PHYOK | To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 22:31:34 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C8D37B405; Sun, 5 Jan 2003 22:31:31 -0800 (PST) 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 BB14237B401 for ; Sun, 5 Jan 2003 22:31:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B24243EE1 for ; Sun, 5 Jan 2003 22:31:29 -0800 (PST) (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 h066VTfh097662 for ; Sun, 5 Jan 2003 22:31:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h066VS9S097637 for perforce@freebsd.org; Sun, 5 Jan 2003 22:31:28 -0800 (PST) Date: Sun, 5 Jan 2003 22:31:28 -0800 (PST) Message-Id: <200301060631.h066VS9S097637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23251 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23251 Change 23251 by peter@peter_itanic2 on 2003/01/05 22:30:57 Try and fix some highly bogus code that gets broken on the RX2600 when there are multiple SSDT's. This shows up as a null pointer derefs or freeing the listhead structures. The reason this is hosed is that it assumes that if the list is empty, it must be the head. If it isn't empty, then it must be a malloc managed object. But, it frees the head first which isn't empty at the time, and isn't a malloc object. BOOM! Take advantage of the circular list and keep freeing ListHead->Next, which will eventually free the list head last, because ListHead->Next == ListHead when there is nothing else left. There's an anti-foot-shooting relic there too though. Count should always be zero at this point. pluto1 can now reboot, with mpt_shutdown #if 0'ed. Affected files ... .. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#5 edit .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#8 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#5 (text+ko) ==== @@ -254,7 +254,7 @@ AcpiTbDeleteSingleTable ( ACPI_TABLE_DESC *TableDesc); -ACPI_TABLE_DESC * +void AcpiTbUninstallTable ( ACPI_TABLE_DESC *TableDesc); ==== //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#8 (text+ko) ==== @@ -537,25 +537,23 @@ ACPI_TABLE_DESC *ListHead) { ACPI_TABLE_DESC *TableDesc; - UINT32 Count; - UINT32 i; ACPI_FUNCTION_TRACE_PTR ("TbFreeAcpiTablesOfType", ListHead); - /* Get the head of the list */ - - TableDesc = ListHead; - Count = ListHead->Count; - /* * Walk the entire list, deleting both the allocated tables * and the table descriptors */ - for (i = 0; i < Count; i++) + while ((ListHead->Next) != (ListHead->Prev)) + { + TableDesc = ListHead->Next; + AcpiTbUninstallTable (TableDesc); + } + if (ListHead->Count > 0) { - TableDesc = AcpiTbUninstallTable (TableDesc); + AcpiTbUninstallTable (ListHead); } return_VOID; @@ -625,11 +623,10 @@ * ******************************************************************************/ -ACPI_TABLE_DESC * +void AcpiTbUninstallTable ( ACPI_TABLE_DESC *TableDesc) { - ACPI_TABLE_DESC *NextDesc; ACPI_FUNCTION_TRACE_PTR ("AcpiTbUninstallTable", TableDesc); @@ -637,7 +634,7 @@ if (!TableDesc) { - return_PTR (NULL); + return_VOID; } /* Unlink the descriptor */ @@ -660,7 +657,6 @@ if ((TableDesc->Prev) == (TableDesc->Next)) { - NextDesc = NULL; /* Clear the list head */ @@ -672,11 +668,10 @@ { /* Free the table descriptor */ - NextDesc = TableDesc->Next; ACPI_MEM_FREE (TableDesc); } - return_PTR (NextDesc); + return_VOID; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 23:23: 6 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B49037B407; Sun, 5 Jan 2003 23:23:03 -0800 (PST) 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 EA60637B405; Sun, 5 Jan 2003 23:23:02 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D67A43ED8; Sun, 5 Jan 2003 23:23:02 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id h067N1rT042807; Sun, 5 Jan 2003 23:23:02 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h067ONWC002378; Sun, 5 Jan 2003 23:24:23 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h067ONqI002377; Sun, 5 Jan 2003 23:24:23 -0800 (PST) Date: Sun, 5 Jan 2003 23:24:23 -0800 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review Message-ID: <20030106072423.GB2184@dhcp01.pn.xcllnt.net> References: <200301060631.h066VS9S097637@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200301060631.h066VS9S097637@repoman.freebsd.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Jan 05, 2003 at 10:31:28PM -0800, Peter Wemm wrote: > > pluto1 can now reboot, with mpt_shutdown #if 0'ed. You the man! If I'm not mistaken, we can also try the sparse memory support again now and get an additional 1GB of memory. The sparse memory support typically resulted in a panic because a non managed address was given to free at the moment ACPI was shut down. This look like it might be the root cause... I'll try that in between everything else I'm doing in between :-) -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jan 5 23:50:49 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00CB637B405; Sun, 5 Jan 2003 23:50:47 -0800 (PST) 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 99AB537B401 for ; Sun, 5 Jan 2003 23:50:47 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B23343EB2 for ; Sun, 5 Jan 2003 23:50:47 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 3A35E2A7EA; Sun, 5 Jan 2003 23:50:47 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review In-Reply-To: <20030106072423.GB2184@dhcp01.pn.xcllnt.net> Date: Sun, 05 Jan 2003 23:50:47 -0800 From: Peter Wemm Message-Id: <20030106075047.3A35E2A7EA@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Sun, Jan 05, 2003 at 10:31:28PM -0800, Peter Wemm wrote: > > > > pluto1 can now reboot, with mpt_shutdown #if 0'ed. > > You the man! > > If I'm not mistaken, we can also try the sparse memory support > again now and get an additional 1GB of memory. The sparse memory > support typically resulted in a panic because a non managed > address was given to free at the moment ACPI was shut down. This > look like it might be the root cause... > > I'll try that in between everything else I'm doing in between :-) I'm really puzzled as to why mpt_shutdown has an effect. Adding some printfs has shown me that it completes and gets past it. As far as sc0 shutdown actually. Oh. OH!! Check how scsi_da.c registers a SHUTDOWN_PRI_DEFAULT handler. Check how kern_module also registers SHUTDOWN_PRI_DEFAULT for doing things like the device tree shutdown, including mpt_shutdown..... Want to bet if this is the cause? Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 0: 9:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DFC837B406; Mon, 6 Jan 2003 00:09:35 -0800 (PST) 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 AA01837B401 for ; Mon, 6 Jan 2003 00:09:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEF1F43EB2 for ; Mon, 6 Jan 2003 00:09:33 -0800 (PST) (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 h0689Xfh030757 for ; Mon, 6 Jan 2003 00:09:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0689XXt030754 for perforce@freebsd.org; Mon, 6 Jan 2003 00:09:33 -0800 (PST) Date: Mon, 6 Jan 2003 00:09:33 -0800 (PST) Message-Id: <200301060809.h0689XXt030754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23259 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23259 Change 23259 by peter@peter_itanic2 on 2003/01/06 00:09:07 This gets pluto1.freebsd.org to reboot without locking up. It is amazing how the mpt driver finds it hard to issue a sync cache command to the driver after it has been reset by the device_shutdown method. Affected files ... .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#25 edit Differences ... ==== //depot/projects/ia64/sys/cam/scsi/scsi_da.c#25 (text+ko) ==== @@ -927,7 +927,7 @@ /* Register our shutdown event handler */ if ((EVENTHANDLER_REGISTER(shutdown_post_sync, dashutdown, - NULL, SHUTDOWN_PRI_DEFAULT)) == NULL) + NULL, SHUTDOWN_PRI_FIRST)) == NULL) printf("dainit: shutdown event registration failed!\n"); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 0:19:19 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5637737B405; Mon, 6 Jan 2003 00:19:18 -0800 (PST) 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 056BC37B401 for ; Mon, 6 Jan 2003 00:19:18 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id C52EF43EA9 for ; Mon, 6 Jan 2003 00:19:16 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id h068JBrT042945; Mon, 6 Jan 2003 00:19:11 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h068KWWC002528; Mon, 6 Jan 2003 00:20:32 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h068KWkk002527; Mon, 6 Jan 2003 00:20:32 -0800 (PST) Date: Mon, 6 Jan 2003 00:20:32 -0800 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review Message-ID: <20030106082032.GF2184@dhcp01.pn.xcllnt.net> References: <20030106072423.GB2184@dhcp01.pn.xcllnt.net> <20030106075047.3A35E2A7EA@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030106075047.3A35E2A7EA@canning.wemm.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Jan 05, 2003 at 11:50:47PM -0800, Peter Wemm wrote: > > I'm really puzzled as to why mpt_shutdown has an effect. Adding some > printfs has shown me that it completes and gets past it. As far as sc0 > shutdown actually. I once did a "shutdown -p", walked away and when I returned hours later I found the machine powered off. Something must have kicked in eventually. Boredom maybe :-) Anyway: it doesn't look like a hard lock, so multiple invocations of the same shutdown handler with a lot of timeouts seems like a possible explanation. Doesn't sound ia64 specific either... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 0:35:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C42937B405; Mon, 6 Jan 2003 00:35:11 -0800 (PST) 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 A429037B401 for ; Mon, 6 Jan 2003 00:35:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C846D43ED1 for ; Mon, 6 Jan 2003 00:35:09 -0800 (PST) (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 h068Z9fh041594 for ; Mon, 6 Jan 2003 00:35:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h068Z9hX041591 for perforce@freebsd.org; Mon, 6 Jan 2003 00:35:09 -0800 (PST) Date: Mon, 6 Jan 2003 00:35:09 -0800 (PST) Message-Id: <200301060835.h068Z9hX041591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23264 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23264 Change 23264 by peter@peter_overcee on 2003/01/06 00:34:13 IFC @23263 Affected files ... .. //depot/projects/ia64/contrib/lukemftpd/libnetbsd/strsuftoll.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/printf.3#17 integrate .. //depot/projects/ia64/lib/libc/stdio/scanf.3#10 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.3#5 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#9 integrate .. //depot/projects/ia64/libexec/lukemftpd/nbsd2fbsd.h#1 branch .. //depot/projects/ia64/libexec/lukemftpd/util.h#1 branch .. //depot/projects/ia64/sbin/devd/devd.cc#3 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#31 integrate .. //depot/projects/ia64/share/man/man4/ida.4#1 branch .. //depot/projects/ia64/share/man/man4/iir.4#1 branch .. //depot/projects/ia64/share/man/man5/Makefile#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#26 integrate .. //depot/projects/ia64/sys/conf/ldscript.i386#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/atomic.S#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/locore.S#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/ofwmagic.S#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/swtch.S#1 branch .. //depot/projects/ia64/sys/sys/syslimits.h#5 integrate .. //depot/projects/ia64/usr.sbin/kernbb/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.8#4 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/extract.c#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#9 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#9 integrate Differences ... ==== //depot/projects/ia64/lib/libc/stdio/printf.3#17 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.54 2002/12/20 08:28:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.55 2003/01/06 06:19:19 tjr Exp $ .\" -.Dd December 20, 2002 +.Dd January 4, 2003 .Dt PRINTF 3 .Os .Sh NAME @@ -872,3 +872,9 @@ argument to .Vt double , providing no additional precision. +.Pp +The +.Nm +family of functions do not correctly handle multibyte characters in the +.Fa format +argument. ==== //depot/projects/ia64/lib/libc/stdio/scanf.3#10 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.22 2002/12/20 07:46:01 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.23 2003/01/06 06:19:19 tjr Exp $ .\" -.Dd December 20, 2002 +.Dd January 4, 2003 .Dt SCANF 3 .Os .Sh NAME @@ -530,3 +530,9 @@ and .Cm \&%A floating-point formats are not implemented. +.Pp +The +.Nm +family of functions do not correctly handle multibyte characters in the +.Fa format +argument. ==== //depot/projects/ia64/lib/libc/stdlib/strfmon.3#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/stdlib/strfmon.3,v 1.6 2002/11/29 15:57:49 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/strfmon.3,v 1.7 2003/01/06 06:21:25 tjr Exp $ .\" .Dd October 12, 2002 .Dt STRFMON 3 @@ -159,3 +159,9 @@ This manual page was written by .An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org based on the standards' text. +.Sh BUGS +The +.Fn strfmon +function does not correctly handle multibyte characters in the +.Fa format +argument. ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#9 (text+ko) ==== @@ -1,18 +1,21 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.8 2002/11/12 07:41:59 obrien Exp $ +# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.9 2003/01/06 03:03:53 obrien Exp $ MAINTAINER= obrien LUKEMFTPD= ${.CURDIR}/../../contrib/lukemftpd -.PATH: ${LUKEMFTPD}/src +.PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd PROG= lukemftpd MAN= lukemftpd.8 ftpd.conf.5 ftpusers.5 MLINKS= ftpusers.5 ftpchroot.5 SRCS= cmds.c conf.c ftpd.c ftpcmd.y popen.c +SRCS+= strsuftoll.c WFORMAT= 0 +CFLAGS+= -include nbsd2fbsd.h CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} -I${LUKEMFTPD}/src +CFLAGS+= -I${.CURDIR}/../..//lib/libc/stdtime YFLAGS= LDADD= -lcrypt -lutil ==== //depot/projects/ia64/sbin/devd/devd.cc#3 (text+ko) ==== @@ -29,18 +29,13 @@ */ // TODO list: -// o rewrite the main loop: -// - find best match -// - execute it. -// o need to insert the event_proc structures in order of priority. -// bigger numbers mean higher priority. // o devd.conf and devd man pages need a lot of help: // - devd.conf needs to lose the warning about zone files. // - devd.conf needs more details on the supported statements. // - devd.conf needs an example or two. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.2 2002/12/18 07:08:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.3 2003/01/06 08:09:41 imp Exp $"); #include #include @@ -56,6 +51,7 @@ #include #include +#include #include #include #include @@ -69,15 +65,28 @@ extern FILE *yyin; extern int lineno; +static const char nomatch = '?'; +static const char attach = '+'; +static const char detach = '-'; + int dflag; int romeo_must_die = 0; static void event_loop(void); static void usage(void); +template void +delete_and_clear(vector &v) +{ + typename vector::const_iterator i; + + for (i = v.begin(); i != v.end(); i++) + delete *i; + v.clear(); +} + class config; - class var_list { public: @@ -130,7 +139,7 @@ public: event_proc(); virtual ~event_proc(); - int get_priority() { return (_prio); } + int get_priority() const { return (_prio); } void set_priority(int prio) { _prio = prio; } void add(eps *); bool matches(config &); @@ -158,10 +167,15 @@ void set_variable(const char *var, const char *val); const string &get_variable(const string &var); const string expand_string(const string &var); + char *set_vars(char *); + void find_and_execute(char); protected: + void sort_vector(vector &); void parse_one_file(const char *fn); void parse_files_in_dir(const char *dirname); void expand_one(const char *&src, char *&dst, char *eod); + bool is_id_char(char); + bool chop_var(char *&buffer, char *&lhs, char *&rhs); private: vector _dir_list; string _pidfile; @@ -229,18 +243,21 @@ bool action::do_action(config &c) { - // xxx - ::system(c.expand_string(_cmd).c_str()); + string s = c.expand_string(_cmd); + if (dflag) + fprintf(stderr, "Executing '%s'\n", s.c_str()); + ::system(s.c_str()); return (true); } match::match(config &c, const char *var, const char *re) - : _var(var), _re(re) + : _var(var) { - string pattern = "^"; - pattern.append(c.expand_string(_re)); - pattern.append("$"); - regcomp(&_regex, pattern.c_str(), REG_EXTENDED | REG_NOSUB); + string pattern = re; + _re = "^"; + _re.append(c.expand_string(string(re))); + _re.append("$"); + regcomp(&_regex, _re.c_str(), REG_EXTENDED | REG_NOSUB); } match::~match() @@ -254,6 +271,10 @@ string value = c.get_variable(_var); bool retval; + if (dflag) + fprintf(stderr, "Testing %s=%s against %s\n", _var.c_str(), + value.c_str(), _re.c_str()); + retval = (regexec(&_regex, value.c_str(), 0, NULL, 0) == 0); return retval; } @@ -268,7 +289,7 @@ i = _vars.find(var); if (i == _vars.end()) - return var_list::bogus; + return (var_list::bogus); return (i->second); } @@ -281,6 +302,8 @@ void var_list::set_variable(const string &var, const string &val) { + if (dflag) + fprintf(stderr, "%s=%s\n", var.c_str(), val.c_str()); _vars[var] = val; } @@ -288,8 +311,10 @@ config::reset(void) { _dir_list.clear(); - _var_list_table.clear(); - // XXX need to cleanup _{attach,detach,nomatch}_list + delete_and_clear(_var_list_table); + delete_and_clear(_attach_list); + delete_and_clear(_detach_list); + delete_and_clear(_nomatch_list); } void @@ -328,6 +353,20 @@ } } +class epv_greater { +public: + int operator()(event_proc *const&l1, event_proc *const&l2) + { + return (l1->get_priority() > l2->get_priority()); + } +}; + +void +config::sort_vector(vector &v) +{ + sort(v.begin(), v.end(), epv_greater()); +} + void config::parse(void) { @@ -336,6 +375,9 @@ parse_one_file(CF); for (i = _dir_list.begin(); i != _dir_list.end(); i++) parse_files_in_dir((*i).c_str()); + sort_vector(_attach_list); + sort_vector(_detach_list); + sort_vector(_nomatch_list); } void @@ -392,6 +434,8 @@ vl = new var_list(); _var_list_table.push_back(vl); + if (dflag) + fprintf(stderr, "Pushing table\n"); } void @@ -399,6 +443,8 @@ { delete _var_list_table.back(); _var_list_table.pop_back(); + if (dflag) + fprintf(stderr, "Popping table\n"); } void @@ -414,14 +460,20 @@ for (i = _var_list_table.rbegin(); i != _var_list_table.rend(); i++) { if ((*i)->is_set(var)) - return (var); + return ((*i)->get_variable(var)); } return (var_list::nothing); } -// Hey script | $ if (*src == '$') { *dst++ = *src++; @@ -437,7 +490,8 @@ } // $(foo) -> $(foo) - // Not sure if I want to support this or not, so for now we just pass it through. + // Not sure if I want to support this or not, so for now we just pass + // it through. if (*src == '(') { *dst++ = '$'; count = 1; @@ -460,7 +514,7 @@ // $var -> replace with value var = src++; - while (*src && isalpha(*src) || isdigit(*src) || *src == '_' || *src == '-') + while (is_id_char(*src)) src++; memcpy(buffer, var, src - var); buffer[src - var] = '\0'; @@ -480,7 +534,7 @@ dst = buffer; while (*src) { if (*src == '$') - expand_one(++src, dst, buffer + sizeof(buffer)); + expand_one(src, dst, buffer + sizeof(buffer)); else *dst++ = *src++; } @@ -489,31 +543,117 @@ return (buffer); } +bool +config::chop_var(char *&buffer, char *&lhs, char *&rhs) +{ + char *walker; + + if (*buffer == '\0') + return (false); + walker = lhs = buffer; + while (is_id_char(*walker)) + walker++; + if (*walker != '=') + return (false); + walker++; // skip = + if (*walker == '"') { + walker++; // skip " + rhs = walker; + while (*walker && *walker != '"') + walker++; + if (*walker != '"') + return (false); + rhs[-2] = '\0'; + *walker++ = '\0'; + } else { + rhs = walker; + while (*walker && !isspace(*walker)) + walker++; + if (*walker != '\0') + *walker++ = '\0'; + rhs[-1] = '\0'; + } + buffer = walker; + return (true); +} + + +char * +config::set_vars(char *buffer) +{ + char *lhs; + char *rhs; + + while (1) { + if (!chop_var(buffer, lhs, rhs)) + break; + set_variable(lhs, rhs); + } + return (buffer); +} + +void +config::find_and_execute(char type) +{ + vector *l; + vector::const_iterator i; + char *s; + + switch (type) { + default: + return; + case nomatch: + l = &_nomatch_list; + s = "nomatch"; + break; + case attach: + l = &_attach_list; + s = "attach"; + break; + case detach: + l = &_detach_list; + s = "detach"; + break; + } + if (dflag) + fprintf(stderr, "Processing %s event\n", s); + for (i = l->begin(); i != l->end(); i++) { + if ((*i)->matches(*this)) { + (*i)->run(*this); + break; + } + } + +} + static void -process_event(const char *buffer) +process_event(char *buffer) { char type; - char cmd[1024]; char *sp; - // XXX should involve config - // XXX and set some variables - // XXX run the list and so forth - - // Ignore unknown devices for now. - if (*buffer == '?') - return; + sp = buffer + 1; + if (dflag) + fprintf(stderr, "Processing event '%s'\n", buffer); type = *buffer++; - sp = strchr(buffer, ' '); - if (sp == NULL) - return; /* Can't happen? */ - *sp = '\0'; - snprintf(cmd, sizeof(cmd), "/etc/devd-generic %s %s", buffer, - type == '+' ? "start" : "stop"); - if (dflag) - printf("Trying '%s'\n", cmd); - system(cmd); + cfg.push_var_table(); + // No match doesn't have a device, and the format is a little + // different, so handle it separately. + if (type != nomatch) { + sp = strchr(sp, ' '); + if (sp == NULL) + return; /* Can't happen? */ + *sp++ = '\0'; + cfg.set_variable("device-name", buffer); + } + if (strncmp(sp, "at ", 3) == 0) + sp += 3; + sp = cfg.set_vars(sp); + if (strncmp(sp, "on ", 3) == 0) + cfg.set_variable("bus", sp + 3); + cfg.find_and_execute(type); + cfg.pop_var_table(); } static void ==== //depot/projects/ia64/sbin/devd/devd.conf.5#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/sbin/devd/devd.conf.5,v 1.5 2002/12/27 12:15:32 schweikh Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.6 2003/01/06 08:03:00 imp Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -46,7 +46,7 @@ .Sh NAME .Nm devd.conf .Nd configuration file for -.Xr devdd 8 +.Xr devd 8 .Sh OVERVIEW .Ss General Syntax A ==== //depot/projects/ia64/share/man/man4/Makefile#31 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.183 2003/01/05 04:47:46 obrien Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.184 2003/01/06 04:51:20 trhodes Exp $ MAN= aac.4 \ acpi.4 \ @@ -64,12 +64,14 @@ ichsmb.4 \ icmp.4 \ icmp6.4 \ + ida.4 \ ieee80211.4 \ ifmib.4 \ iic.4 \ iicbb.4 \ iicbus.4 \ iicsmb.4 \ + iir.4 \ inet.4 \ inet6.4 \ intpm.4 \ ==== //depot/projects/ia64/share/man/man5/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/man/man5/Makefile,v 1.44 2002/12/29 21:31:45 trhodes Exp $ +# $FreeBSD: src/share/man/man5/Makefile,v 1.45 2003/01/06 05:18:42 trhodes Exp $ #MISSING: dump.5 plot.5 MAN= a.out.5 acct.5 core.5 devfs.5 device.hints.5 \ @@ -15,7 +15,8 @@ rc.conf.5 remote.5 resolver.5 \ services.5 shells.5 stab.5 sysctl.conf.5 utmp.5 -MLINKS= dir.5 dirent.5 +MLINKS= a.out.5 aout.5 +MLINKS=+dir.5 dirent.5 MLINKS+=fs.5 inode.5 MLINKS+=hosts.equiv.5 rhosts.5 MLINKS+=msdosfs.5 msdos.5 ==== //depot/projects/ia64/sys/cam/scsi/scsi_da.c#26 (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.118 2002/12/18 21:47:52 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.119 2003/01/06 08:28:15 peter Exp $ */ #ifdef _KERNEL ==== //depot/projects/ia64/sys/conf/ldscript.i386#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.6 2002/10/11 19:38:04 obrien Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.7 2003/01/06 07:37:15 phk Exp $ */ OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") OUTPUT_ARCH(i386) ENTRY(btext) @@ -65,10 +65,14 @@ CONSTRUCTORS } .data1 : { *(.data1) } + _start_ctors = .; + PROVIDE (start_ctors = .); .ctors : { *(.ctors) } + _stop_ctors = .; + PROVIDE (stop_ctors = .); .dtors : { *(.dtors) ==== //depot/projects/ia64/sys/dev/firewire/firewire.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.15 2003/01/05 14:58:45 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.16 2003/01/06 05:57:48 simokawa Exp $ * */ @@ -1696,7 +1696,7 @@ printf("\n"); } } - err = device_get_children(fc->dev, &devlistp, &devcnt); + err = device_get_children(fc->bdev, &devlistp, &devcnt); if( err != 0 ) return; for( i = 0 ; i < devcnt ; i++){ ==== //depot/projects/ia64/sys/dev/firewire/fwdev.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.3 2003/01/04 16:03:50 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.4 2003/01/06 08:07:20 simokawa Exp $ * */ @@ -728,8 +728,8 @@ case FWASREQEUI: fwdev = fw_noderesolve(sc->fc, asyreq->req.dst.eui); if (fwdev == NULL) { - printf("%s:cannot find node\n", - device_get_nameunit(sc->fc->dev)); + device_printf(sc->fc->bdev, + "cannot find node\n"); err = EINVAL; goto error; } ==== //depot/projects/ia64/sys/kern/subr_prof.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/subr_prof.c,v 1.55 2002/10/01 13:15:11 phk Exp $ + * $FreeBSD: src/sys/kern/subr_prof.c,v 1.56 2003/01/06 07:40:49 phk Exp $ */ #include @@ -157,6 +157,7 @@ uintfptr_t tmp_addr; #endif + tcov_init(); /* * Round lowpc and highpc to multiples of the density we're using * so the rest of the scaling (here and in gprof) stays in ints. @@ -531,3 +532,49 @@ } stopprofclock(p); } + +#if defined(__i386__) && __GNUC__ >= 2 +/* + * Support for "--test-coverage --profile-arcs" in GCC. + * + * We need to call all the functions in the .ctor section, in order + * to get all the counter-arrays strung into a list. + * + * XXX: the .ctors call __bb_init_func which is located in over in + * XXX: i386/i386/support.s for historical reasons. There is probably + * XXX: no reason for that to be assembler anymore, but doing it right + * XXX: in MI C code requires one to reverse-engineer the type-selection + * XXX: inside GCC. Have fun. + * + * XXX: Worrisome perspective: Calling the .ctors may make C++ in the + * XXX: kernel feasible. Don't. + */ +typedef void (*ctor_t)(void); +extern ctor_t _start_ctors, _stop_ctors; + +static void +tcov_init(void *foo __unused) +{ + ctor_t *p, q; + + for (p = &_start_ctors; p < &_stop_ctors; p++) { + q = *p; + q(); + } +} + +SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_SECOND, tcov_init, NULL) + +/* + * GCC contains magic to recognize calls to for instance execve() and + * puts in calls to this function to preserve the profile counters. + * XXX: Put zinging punchline here. + */ +void __bb_fork_func(void); +void +__bb_fork_func(void) +{ +} + +#endif + ==== //depot/projects/ia64/sys/netinet6/ip6_fw.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.20 2002/12/19 22:58:26 bmilekic Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.21 2003/01/06 04:33:46 mike Exp $ */ /* $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */ /* @@ -976,7 +976,7 @@ /* Check length */ if (m->m_len != sizeof(struct ip6_fw)) { dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len, - sizeof(struct ip6_fw))); + (int)sizeof(struct ip6_fw))); return (NULL); } return(check_ip6fw_struct(mtod(m, struct ip6_fw *))); @@ -1193,7 +1193,7 @@ if (stage == IPV6_FW_DEL) { if (m->m_len != sizeof(struct ip6_fw)) { dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len, - sizeof(struct ip6_fw))); + (int)sizeof(struct ip6_fw))); error = EINVAL; } else if (mtod(m, struct ip6_fw *)->fw_number == (u_short)-1) { dprintf(("%s can't delete rule 65535\n", err_prefix)); ==== //depot/projects/ia64/sys/sys/syslimits.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)syslimits.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/syslimits.h,v 1.14 2002/11/29 23:49:27 mike Exp $ + * $FreeBSD: src/sys/sys/syslimits.h,v 1.15 2003/01/06 04:33:47 obrien Exp $ */ #ifndef _SYS_SYSLIMITS_H_ @@ -52,6 +52,7 @@ #define CHILD_MAX 40 /* max simultaneous processes */ #endif #define LINK_MAX 32767 /* max file link count */ +#define LOGIN_NAME_MAX 17 /* max login name length (incl. NUL) */ #define MAX_CANON 255 /* max bytes in term canon input line */ #define MAX_INPUT 255 /* max bytes in terminal input */ #define NAME_MAX 255 /* max bytes in a file name */ @@ -68,7 +69,6 @@ * assume conservative values or call sysconf() to get the current value. * * HOST_NAME_MAX - * LOGIN_NAME_MAX * * (We should do this for most of the values currently defined here, * but many programs are not prepared to deal with this yet.) ==== //depot/projects/ia64/usr.sbin/kernbb/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.8 2001/07/20 06:19:54 obrien Exp $ +# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.9 2003/01/06 07:46:26 phk Exp $ PROG= kernbb MAN= kernbb.8 @@ -6,5 +6,6 @@ DPADD= ${LIBKVM} LDADD= -lkvm +WARNS?= 3 .include ==== //depot/projects/ia64/usr.sbin/kernbb/kernbb.8#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/usr.sbin/kernbb/kernbb.8,v 1.16 2002/07/14 14:43:42 charnier Exp $ +.\" $FreeBSD: src/usr.sbin/kernbb/kernbb.8,v 1.17 2003/01/06 07:46:26 phk Exp $ .\" .Dd May 22, 1995 .Dt KERNBB 8 @@ -42,20 +42,28 @@ .Sh DESCRIPTION The .Nm -utility is used to dump the basic-block profiling buffers of the running -kernel. +utility is used to extract the basic-block profiling buffers of the running +kernel into the files needed for the +.Xr gcov 1 +tool. .Pp At least one source file in the running kernel must have been compiled with the -.Fl a -option. +.Fl --test-coverage +and +.Fl --profile-arcs +options. +.Pp +The output is stored in the filenames compiled into the kernel by +.Xr gcc 1 . +If the absolute pathname cannot be written to, the directory part +of the filename is discarded and the file stored in the current +directory under its basename. .Pp -The output format is -.Tn ASCII , -consisting of one line per record with the -following fields: filename, linenumber, procedure, address, count -of executions, length of the basic-block in bytes and the product of -the previous two fields. +The output files are named *.da, and the +.Xr gcov 1 +program will extract the counts and merge them with the source +file to show actual execution counts. .Sh FILES .Bl -tag -width /boot/kernel/kernel -compact .It Pa /boot/kernel/kernel @@ -65,9 +73,12 @@ .El .Sh SEE ALSO .Xr cc 1 +.Xr gcov 1 .Sh AUTHORS The .Nm utility was written by .An Poul-Henning Kamp , along with the kernel-support. +.Sh BUGS +There are far too much magic and internal knowledge from GCC in this. ==== //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#3 (text+ko) ==== @@ -10,7 +10,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.13 2002/08/18 17:57:08 bde Exp $"; + "$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.14 2003/01/06 07:46:26 phk Exp $"; #endif /* not lint */ #include @@ -22,8 +22,6 @@ #include #include -#define MAXBB 32768 - struct bb { u_long zero_one; u_long filename; @@ -38,27 +36,20 @@ }; struct nlist namelist[] = { - { "bbhead" }, - { NULL } + { "bbhead", 0, 0, 0, 0 }, + { NULL, 0, 0, 0, 0 } }; -u_long lineno[MAXBB]; -u_long counts[MAXBB]; -u_long addr[MAXBB]; -u_long func[MAXBB]; -u_long file[MAXBB]; -char *fn[MAXBB]; -char *pn[MAXBB]; - kvm_t *kv; int -main() +main(int argc __unused, char **argv __unused) { - int i,j; + int i; u_long l1,l2,l4; struct bb bb; - char buf[128]; + char buf[BUFSIZ], *p; + FILE *f; kv = kvm_open(NULL,NULL,NULL,O_RDWR,"dnc"); if (!kv) @@ -73,68 +64,30 @@ l1 += sizeof l1; kvm_read(kv,l2,&bb,sizeof bb); l2 = bb.next; - if (!bb.ncounts) - continue; - if (bb.ncounts > MAXBB) - errx(1, "found %lu counts above limit of %u", - bb.ncounts, MAXBB); - kvm_read(kv,bb.lineno,lineno, bb.ncounts * sizeof lineno[0]); - kvm_read(kv,bb.counts,counts, bb.ncounts * sizeof counts[0]); - kvm_read(kv,bb.addr, addr, bb.ncounts * sizeof addr[0]); - kvm_read(kv,bb.file, file, bb.ncounts * sizeof file[0]); - kvm_read(kv,bb.func, func, bb.ncounts * sizeof func[0]); + kvm_read(kv, bb.filename, buf, sizeof(buf)); + p = buf; + f = fopen(p, "w"); + if (f != NULL) { + printf("Writing \"%s\"\n", p); + } else { + p = strrchr(buf, '/'); + if (p == NULL) + p = buf; + else + p++; + printf("Writing \"%s\" (spec \"%s\")\n", p, buf); + f = fopen(p, "w"); + } + if (f == NULL) + err(1,"%s", p); + fwrite(&bb.ncounts, 4, 1, f); l4 = 0; - for (i=0; i < bb.ncounts; i++) { - if (counts[i]) - l4++; - if (!func[i] && i+1 < bb.ncounts) - func[i] = func[i+1]; - } - if (!l4) - continue; - for (i=0; i < bb.ncounts; i++) { - - if (0 && !counts[i]) - continue; - - if (!pn[i] && func[i]) { - kvm_read(kv,func[i], buf, sizeof buf); - buf[sizeof buf -1] = 0; - pn[i] = strdup(buf); - for(j=i+1;j>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 1: 2:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CEB837B405; Mon, 6 Jan 2003 01:02:45 -0800 (PST) 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 CA18E37B401 for ; Mon, 6 Jan 2003 01:02:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83F6843EB2 for ; Mon, 6 Jan 2003 01:02:44 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0692ifh052152 for ; Mon, 6 Jan 2003 01:02:44 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0692hPL052149 for perforce@freebsd.org; Mon, 6 Jan 2003 01:02:43 -0800 (PST) Date: Mon, 6 Jan 2003 01:02:43 -0800 (PST) Message-Id: <200301060902.h0692hPL052149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23265 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23265 Change 23265 by des@des.at.des.thinksec.com on 2003/01/06 01:02:34 Document dependency on (for size_t) Affected files ... .. //depot/projects/openpam/misc/gendoc.pl#19 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#19 (text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#18 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#19 $ # use strict; @@ -355,6 +355,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h "; if ($func->{'name'} =~ m/_sm_/) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 1: 3:48 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B0A337B405; Mon, 6 Jan 2003 01:03:47 -0800 (PST) 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 C4B5137B401 for ; Mon, 6 Jan 2003 01:03:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E95943E4A for ; Mon, 6 Jan 2003 01:03:46 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0693kfh052172 for ; Mon, 6 Jan 2003 01:03:46 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0693jh7052169 for perforce@freebsd.org; Mon, 6 Jan 2003 01:03:45 -0800 (PST) Date: Mon, 6 Jan 2003 01:03:45 -0800 (PST) Message-Id: <200301060903.h0693jh7052169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23266 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23266 Change 23266 by des@des.at.des.thinksec.com on 2003/01/06 01:03:35 Credit Juli Mallett for her many contributions. Affected files ... .. //depot/projects/openpam/CREDITS#6 edit Differences ... ==== //depot/projects/openpam/CREDITS#6 (text+ko) ==== @@ -17,6 +17,7 @@ Eric Melville Gary Winiger Joe Marcus Clarke + Juli Mallett Mark Murray Mikko Työläjärvi Robert Watson @@ -24,4 +25,4 @@ Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#5 $ +$P4: //depot/projects/openpam/CREDITS#6 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 1:16: 5 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD88537B405; Mon, 6 Jan 2003 01:16:02 -0800 (PST) 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 64D7237B401 for ; Mon, 6 Jan 2003 01:16:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 096D643EA9 for ; Mon, 6 Jan 2003 01:16:02 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h069G1fh056010 for ; Mon, 6 Jan 2003 01:16:01 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h069G12b056007 for perforce@freebsd.org; Mon, 6 Jan 2003 01:16:01 -0800 (PST) Date: Mon, 6 Jan 2003 01:16:01 -0800 (PST) Message-Id: <200301060916.h069G12b056007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23267 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23267 Change 23267 by des@des.at.des.thinksec.com on 2003/01/06 01:15:01 Release OpenPAM Daffodil. Affected files ... .. //depot/projects/openpam/HISTORY#17 edit .. //depot/projects/openpam/RELNOTES#14 edit Differences ... ==== //depot/projects/openpam/HISTORY#17 (text+ko) ==== @@ -1,3 +1,11 @@ +OpenPAM Daffodil 2003-01-06 + + - ENHANCE: Document dependency on (for size_t) + + - ENHANCE: Slightly improve error detection in openpam_ttyconv(). + + - BUGFIX: Fix several typos in debugging macros. +============================================================================ OpenPAM Cyclamen 2002-12-12 - ENHANCE: Improve recursion detection in openpam_dispatch(). @@ -198,4 +206,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#16 $ +$P4: //depot/projects/openpam/HISTORY#17 $ ==== //depot/projects/openpam/RELNOTES#14 (text+ko) ==== @@ -1,7 +1,11 @@ - Release notes for OpenPAM Cyclamen + Release notes for OpenPAM Daffodil ================================== +This is a bugfix release. The previous release, Cyclamen, was rushed +out without sufficient testing, and contained a number of small but +serious errors. + This release corresponds to the code used in FreeBSD-CURRENT as of the release date. It has also been successfully built on NetBSD 1.6, and should build with minimal or no changes on OpenBSD. Work is underway @@ -23,4 +27,4 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#13 $ +$P4: //depot/projects/openpam/RELNOTES#14 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 8: 9:43 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAB2937B405; Mon, 6 Jan 2003 08:09:28 -0800 (PST) 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 8095237B401 for ; Mon, 6 Jan 2003 08:09:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DD8E43ED1 for ; Mon, 6 Jan 2003 08:09:27 -0800 (PST) (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 h06G9Rfh002768 for ; Mon, 6 Jan 2003 08:09:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06G9R1I002765 for perforce@freebsd.org; Mon, 6 Jan 2003 08:09:27 -0800 (PST) Date: Mon, 6 Jan 2003 08:09:27 -0800 (PST) Message-Id: <200301061609.h06G9R1I002765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23273 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23273 Change 23273 by peter@peter_overcee on 2003/01/06 08:09:09 IFC @23272 *kick* trhodes Affected files ... .. //depot/projects/ia64/share/man/man5/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#5 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#33 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#5 integrate Differences ... ==== //depot/projects/ia64/share/man/man5/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/man/man5/Makefile,v 1.45 2003/01/06 05:18:42 trhodes Exp $ +# $FreeBSD: src/share/man/man5/Makefile,v 1.46 2003/01/06 15:30:55 trhodes Exp $ #MISSING: dump.5 plot.5 MAN= a.out.5 acct.5 core.5 devfs.5 device.hints.5 \ @@ -16,7 +16,7 @@ services.5 shells.5 stab.5 sysctl.conf.5 utmp.5 MLINKS= a.out.5 aout.5 -MLINKS=+dir.5 dirent.5 +MLINKS+=dir.5 dirent.5 MLINKS+=fs.5 inode.5 MLINKS+=hosts.equiv.5 rhosts.5 MLINKS+=msdosfs.5 msdos.5 ==== //depot/projects/ia64/sys/boot/pc98/boot2/bios.S#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.3 2001/05/24 11:18:32 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.4 2003/01/06 13:43:13 nyan Exp $ */ /* @@ -94,6 +94,26 @@ #ifndef CDBOOT /* + * PC-9801/PC-9821 SCSI MO booting + * 2002/06/05-07/03 Kawanobe Koh + * + */ +scsi_hd: + .code16 + push %cx + push %ds + mov %bl, %cl /* UA */ + and $0x0F, %cl + xor %ax, %ax + mov %ax, %ds + mov (0x0482), %al /* SCSI HD equipment bits */ + shr %cl, %al + pop %ds + pop %cx + test $1, %al + ret + +/* * biosread(dev, cyl, head, sec, nsec, offset) * Read "nsec" sectors from disk to offset "offset" in boot segment * BIOS call "INT 0x1B Function 0xn6" to read sectors from disk into memory @@ -118,54 +138,58 @@ push %esi push %edi - movb 0x14(%ebp), %dl /* sector */ - movb 0x10(%ebp), %dh /* head */ - movw 0x0c(%ebp), %cx /* cylinder */ - movb 0x08(%ebp), %al /* DA/UA */ - movb $0x06, %ah - andb $0xf0, %al - cmpb $0x30, %al - jz fd - cmpb $0x90, %al - jnz 1f -fd: - incb %dl - movb $0x02, %ch - movb $0xd6, %ah -1: - movb 0x08(%ebp), %al - movl %eax, %ebx + mov 0x08(%ebp), %bl /* (byte) DA/UA */ + mov 0x0C(%ebp), %ecx /* (word) cylinder */ + mov 0x10(%ebp), %dh /* (byte) head */ + mov 0x14(%ebp), %dl /* (byte) sector */ + mov 0x18(%ebp), %esi /* (byte) number of sectors */ + mov 0x1C(%ebp), %edi /* (word) destination offset */ /* prot_to_real will set %es to BOOTSEG */ call EXT(prot_to_real) /* enter real mode */ - mov %ebx, %eax - xor %ebx, %ebx - addr32 - movb 0x18(%ebp), %bl /* number of sectors */ .code16 - shl $9, %ebx - push %ebx - .code32 - addr32 - data32 - mov 0x1c(%ebp), %ebx - .code16 - mov %ebx, %ebp - pop %ebx + mov $0x06, %bh /* read data function */ + mov %bl, %al /* DA */ + and $0xF0, %al + cmp $0x30, %al /* 1440KB FD */ + jz read_floppy + cmp $0x90, %al /* 1200KB FD */ + jz read_floppy + cmp $0xA0, %al /* SCSI HD or MO */ + jnz read_next + call scsi_hd + jnz read_next +read_linear: + mov %dh, %al /* change to linear sector */ + shl $5, %al /* multiply by 32 sector per track */ + add %dl, %al + xor %dh, %dh /* higher 16 bits into %dx */ + mov %ch, %dl + mov %cl, %ch /* lower 16 bits into %cx */ + mov %al, %cl + and $0x7F, %bl /* linear access DA/UA */ + jmp read_next +read_floppy: + inc %dx /* sector address begins from one */ + mov $0x02, %ch /* 512 bytes sector */ + mov $0xD6, %bh /* MT MFM retry seek */ +read_next: + mov %si, %ax /* number of sectors */ + shl $9, %ax /* multiply by 512 bytes */ + xchg %bx, %ax + mov %di, %bp /* destination offset */ + int $0x1B /* disk bios call */ + jc read_end + xor %ax, %ax +read_end: + mov %ax, %bx /* save return value */ - int $0x1b - jc 1f .code32 - xor %eax, %eax -1: - /* save return value (actually movw %ax, %bx) */ - mov %eax, %ebx - data32 call EXT(real_to_prot) /* back to protected mode */ xor %eax, %eax - movb %bh, %al /* return value in %ax */ + mov %bh, %al /* return value in %eax */ pop %edi pop %esi @@ -360,46 +384,61 @@ push %ebp mov %esp, %ebp push %ebx - push %esi - push %edi + + mov 0x08(%ebp), %bl /* (byte) DA/UA */ - movb 0x8(%ebp), %dl /* diskinfo(drive #) */ call EXT(prot_to_real) /* enter real mode */ .code16 + mov %bl, %al /* DA */ + and $0xf0, %al + mov $18, %dl /* 1440KB FD sectors per track */ + cmp $0x30, %al + jz floppy + mov $15, %dl /* 1200KB FD sectors per track */ + cmp $0x90, %al + jz floppy + cmp $0xA0, %al /* SCSI HD or MO */ + jnz sense + call scsi_hd + jnz sense - movb %dl, %al /* ask for disk info */ - andb $0xf0, %al - cmpb $0x30, %al - jz fdd4 - cmpb $0x90, %al - jz fdd + push %ds /* SCSI MO or CD ? */ + xor %ax, %ax + mov %ax, %ds + and $0x0F, %bx /* UA */ + shl $2, %bx /* parameter offset */ + add $0x0460, %bx + mov (%bx), %al /* SCSI equipment parameter[0] */ + and $0x1F, %al /* peripheral device type */ + cmp $7, %al /* SCSI MO */ + jnz good + add $3, %bx + mov (%bx), %al /* SCSI equipment parameter[3] */ + test $0x30, %al /* sector length from 256 to 2048 */ + jnz good + or $0x10, %al /* forced set 512 bytes sector */ + mov %al, (%bx) + mov $0xA100, %dx /* refered by C language */ + mov %dx, %ds + mov %al, (%bx) +good: + pop %ds - movb %dl, %al - movb $0x84, %ah - + mov $0xFFFE, %cx /* virtual 65535 cylinders setting */ + mov $0x0820, %dx /* standard 8 heads and 32 sectors */ + jmp ok +sense: + mov $0x84, %ah /* ask for disk info */ + mov %bl, %al int $0x1b - - jnc ok + jnc ok /* use %cx and %dx after */ /* * Urk. Call failed. It is not supported for floppies by old BIOS's. * Guess it's a 15-sector floppy. */ -fdd4: - movb $18, %dl - jmp 1f -fdd: - movb $15, %dl /* max sector */ -1: - subb %ah, %ah /* %ax = 0 */ - movb %al, %al - movb %ah, %bh /* %bh = 0 */ - movb $2, %bl /* %bl bits 0-3 = drive type, - bit 2 = 1.2M */ - movb $79, %ch /* max track */ - movb $1, %cl /* # floppy drives installed */ - movb $2, %dh /* max head */ - /* es:di = parameter table */ - /* carry = 0 */ +floppy: + mov $79, %cx /* 80 cylinders 1200K and 1440K FD */ + mov $2, %dh /* 2 heads as double side */ ok: .code32 data32 @@ -412,12 +451,9 @@ * 8 bit sector */ mov %ecx, %eax - sall $16,%eax /* << 16 */ - movb %dh, %ah /* max head */ - movb %dl, %al /* max sector (and # sectors) */ + sal $16, %eax /* max cylinder number from zero */ + mov %dx, %ax /* number of heads and sectors */ - pop %edi - pop %esi pop %ebx pop %ebp ret ==== //depot/projects/ia64/sys/boot/pc98/boot2/boot.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.9 2002/10/03 16:20:14 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.10 2003/01/06 13:43:13 nyan Exp $ */ @@ -118,11 +118,16 @@ dosdev = drive; #ifdef PC98 maj = (drive&0x70) >> 3; /* a good first bet */ - if (maj == 4) { /* sd */ + if (maj == 4) { /* da */ disk_equips = *(unsigned char *)V(0xA1482); unit = 0; for (i=0; i<(drive&0x0f); i++) { - unit += (disk_equips >> i) & 1; + int media = ((unsigned *)V(0xA1460))[i] & 0x1F; + + if ((disk_equips >> i) & 1) /* HD */ + unit++; + else if (media == 7) /* MO */ + unit++; } } else { unit = drive & 0x0f; ==== //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.7 2003/01/04 08:50:48 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.8 2003/01/06 13:43:13 nyan Exp $ */ /* @@ -129,17 +129,6 @@ printf("bad disklabel\n"); return 1; } - if( (maj == 4) || (maj == 0) || (maj == 1)) - { - if (dl->d_type == DTYPE_SCSI) - { - maj = 4; /* use scsi as boot dev */ - } - else - { - maj = 0; /* must be ESDI/IDE */ - } - } /* This little trick is for OnTrack DiskManager disks */ boff = dl->d_partitions[part].p_offset - dl->d_partitions[2].p_offset + sector; ==== //depot/projects/ia64/sys/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.2 1999/08/28 00:40:26 peter Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.3 2003/01/06 13:43:14 nyan Exp $ */ /* @@ -275,8 +275,8 @@ switch(maj) { #ifdef PC98 - case 4: /* sd */ - dosdev_copy = biosdrive | 0xa0; + case 4: /* da */ + dosdev_copy = biosdrive | 0xA0; /* SCSI HD or MO */ #else /* IBM-PC */ case 0: case 4: @@ -284,8 +284,8 @@ #endif break; #ifdef PC98 - case 0: - case 2: + case 0: /* wd */ + case 2: /* 1200KB fd */ dosdev_copy = (maj << 3) | unit | 0x80; #else case 2: @@ -293,7 +293,7 @@ #endif break; #ifdef PC98 - case 6:/* 1.44MB FD */ + case 6: /* 1440KB fd */ dosdev_copy = (maj << 3) | unit; break; #endif ==== //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#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/boot/pc98/libpc98/biosdisk.c,v 1.20 2003/01/04 08:50:48 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.21 2003/01/06 13:43:15 nyan Exp $ */ /* @@ -81,6 +81,9 @@ #define BD_FLOPPY 0x0004 #define BD_LABELOK 0x0008 #define BD_PARTTABOK 0x0010 +#ifdef PC98 +#define BD_OPTICAL 0x0020 +#endif struct disklabel od_disklabel; int od_nslices; /* slice count */ struct pc98_partition od_slicetab[MAX_SLICES]; @@ -198,7 +201,7 @@ } } else { - if ((unit & 0xa0) == 0xa0) + if ((unit & 0xF0) == 0xA0) /* SCSI HD or MO */ bdinfo[nbdinfo].bd_da_unit = da_drive++; } /* XXX we need "disk aliases" to make this simpler */ @@ -257,6 +260,14 @@ bd->bd_flags |= BD_MODEINT13; return(1); } + if ((bd->bd_unit & 0xF0) == 0xA0) { + int media = ((unsigned *)PTOV(0xA1460))[bd->bd_unit & 0x0F] & 0x1F; + + if (media == 7) { /* MO */ + bd->bd_flags |= BD_MODEINT13 | BD_OPTICAL; + return(1); + } + } return(0); #else v86.ctl = V86_FLAGS; @@ -1081,7 +1092,13 @@ v86.eax = 0x0600 | od->od_unit; v86.ecx = cyl; } - v86.edx = (hd << 8) | sec; + if (od->od_flags & BD_OPTICAL) { + v86.eax &= 0xFF7F; + v86.ecx = dblk & 0xFFFF; + v86.edx = dblk >> 16; + } else { + v86.edx = (hd << 8) | sec; + } v86.ebx = x * BIOSDISK_SECSIZE; v86.es = VTOPSEG(xp); v86.ebp = VTOPOFF(xp); @@ -1362,6 +1379,10 @@ od->od_cyl = 79; od->od_hds = 2; od->od_sec = (od->od_unit & 0xf0) == 0x30 ? 18 : 15; + } else if (od->od_flags & BD_OPTICAL) { + od->od_cyl = 0xFFFE; + od->od_hds = 8; + od->od_sec = 32; } else { v86.ctl = V86_FLAGS; v86.addr = 0x1b; @@ -1423,19 +1444,26 @@ if (*(u_char *)PTOV(addr) & (1 << (unit & 0x0f))) if (hds++ == bunit) break; + + if (unit >= 0xA0) { + int media = ((unsigned *)PTOV(0xA1460))[unit & 0x0F] & 0x1F; + + if (media == 7 && hds++ == bunit) /* SCSI MO */ + return(0xFFFE0820); /* C:65535 H:8 S:32 */ + } if (++unit == 0x84) { - unit = 0xa0; /* SCSI HDD */ + unit = 0xA0; /* SCSI HDD */ addr = 0xA1482; } } if (unit == 0xa7) - return 0x4f010f; + return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ v86.ctl = V86_FLAGS; v86.addr = 0x1b; v86.eax = 0x8400 | unit; v86int(); if (v86.efl & 0x1) - return 0x4f010f; + return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ return ((v86.ecx & 0xffff) << 16) | (v86.edx & 0xffff); #else v86.ctl = V86_FLAGS; ==== //depot/projects/ia64/sys/kern/kern_descrip.c#42 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.177 2003/01/01 01:19:31 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.178 2003/01/06 13:19:05 nectar Exp $ */ #include "opt_compat.h" @@ -483,6 +483,7 @@ error = fdalloc(td, new, &newfd); if (error) { FILEDESC_UNLOCK(fdp); + fdrop(fp, td); return (error); } } ==== //depot/projects/ia64/sys/kern/vfs_syscalls.c#33 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.302 2002/12/14 08:18:06 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.303 2003/01/06 13:19:05 nectar Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -1326,8 +1326,10 @@ case L_INCR: if (noneg && (fp->f_offset < 0 || - (offset > 0 && fp->f_offset > OFF_MAX - offset))) - return (EOVERFLOW); + (offset > 0 && fp->f_offset > OFF_MAX - offset))) { + error = EOVERFLOW; + break; + } offset += fp->f_offset; break; case L_XTND: @@ -1335,21 +1337,26 @@ error = VOP_GETATTR(vp, &vattr, cred, td); VOP_UNLOCK(vp, 0, td); if (error) - return (error); + break; if (noneg && (vattr.va_size > OFF_MAX || - (offset > 0 && vattr.va_size > OFF_MAX - offset))) - return (EOVERFLOW); + (offset > 0 && vattr.va_size > OFF_MAX - offset))) { + error = EOVERFLOW; + break; + } offset += vattr.va_size; break; case L_SET: break; default: + error = EINVAL; + } + if (error == 0 && noneg && offset < 0) + error = EINVAL; + if (error != 0) { fdrop(fp, td); - return (EINVAL); + return (error); } - if (noneg && offset < 0) - return (EINVAL); fp->f_offset = offset; *(off_t *)(td->td_retval) = fp->f_offset; fdrop(fp, td); ==== //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.6 2002/12/10 16:20:33 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.7 2003/01/06 12:07:38 mux Exp $ */ /* @@ -1057,8 +1057,7 @@ struct vnode *vp, struct label *vlabel) { struct mac_lomac temp, *source, *dest; - size_t buflen; - int error; + int buflen, error; source = SLOT(fslabel); dest = SLOT(vlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 8:16:55 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22D4437B405; Mon, 6 Jan 2003 08:16:54 -0800 (PST) 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 C4D0637B401 for ; Mon, 6 Jan 2003 08:16:53 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8498543E4A for ; Mon, 6 Jan 2003 08:16:53 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 52ACD2A89E; Mon, 6 Jan 2003 08:16:48 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review In-Reply-To: <20030106082032.GF2184@dhcp01.pn.xcllnt.net> Date: Mon, 06 Jan 2003 08:16:48 -0800 From: Peter Wemm Message-Id: <20030106161648.52ACD2A89E@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Sun, Jan 05, 2003 at 11:50:47PM -0800, Peter Wemm wrote: > > > > I'm really puzzled as to why mpt_shutdown has an effect. Adding some > > printfs has shown me that it completes and gets past it. As far as sc0 > > shutdown actually. > > I once did a "shutdown -p", walked away and when I returned hours > later I found the machine powered off. Something must have kicked > in eventually. Boredom maybe :-) > > Anyway: it doesn't look like a hard lock, so multiple invocations > of the same shutdown handler with a lot of timeouts seems like a > possible explanation. Doesn't sound ia64 specific either... Thinking more about it.. I did notice timeout messages from the mpt driver if I left it long enough. I guess da gave up eventually. Anyway, moving the dashutdown calls to before the device tree is shot down solved the problem. It now cleanly reboots with mpt and acpica. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 9:21: 5 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB9AC37B401; Mon, 6 Jan 2003 09:21:03 -0800 (PST) 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 367A137B405 for ; Mon, 6 Jan 2003 09:21:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E347643ED1 for ; Mon, 6 Jan 2003 09:21:02 -0800 (PST) (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 h06HL2fh030883 for ; Mon, 6 Jan 2003 09:21:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06HL2UU030867 for perforce@freebsd.org; Mon, 6 Jan 2003 09:21:02 -0800 (PST) Date: Mon, 6 Jan 2003 09:21:02 -0800 (PST) Message-Id: <200301061721.h06HL2UU030867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23284 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23284 Change 23284 by peter@peter_itanic2 on 2003/01/06 09:20:31 stop c++ backend from freaking out about the -W...-bad-pointer-cast stuff. Affected files ... .. //depot/projects/ia64/contrib/gcc/cp/decl2.c#9 edit Differences ... ==== //depot/projects/ia64/contrib/gcc/cp/decl2.c#9 (text+ko) ==== @@ -682,6 +682,10 @@ warn_nontemplate_friend = setting; else if (!strcmp (p, "deprecated")) warn_deprecated = setting; + else if (!strcmp (p, "bad-pointer-cast")) + ; /* ignore */ + else if (!strcmp (p, "error-bad-pointer-cast")) + ; /* ignore */ else if (!strcmp (p, "comment")) ; /* cpp handles this one. */ else if (!strcmp (p, "comments")) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 11:23: 5 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85B5F37B405; Mon, 6 Jan 2003 11:23:03 -0800 (PST) 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 20D0737B401 for ; Mon, 6 Jan 2003 11:23:03 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76A5043EE1 for ; Mon, 6 Jan 2003 11:23:01 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id h06JN1rT044432; Mon, 6 Jan 2003 11:23:01 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h06JOOM2000663; Mon, 6 Jan 2003 11:24:24 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h06JONuJ000662; Mon, 6 Jan 2003 11:24:23 -0800 (PST) Date: Mon, 6 Jan 2003 11:24:23 -0800 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review Message-ID: <20030106192423.GA619@dhcp01.pn.xcllnt.net> References: <20030106082032.GF2184@dhcp01.pn.xcllnt.net> <20030106161648.52ACD2A89E@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030106161648.52ACD2A89E@canning.wemm.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Jan 06, 2003 at 08:16:48AM -0800, Peter Wemm wrote: > > Anyway, moving the dashutdown calls to before the device tree is shot down > solved the problem. It now cleanly reboots with mpt and acpica. > Cool! BTW: If you think the machine is ready for more heavy duty (from an administrator point of view), let Kris know. Maybe we have a couple of full ports builds before 5.0-R. I'm interested to see if anything actually breaks due to a 64-bit time_t and how deep the int->ptr cast bites us. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 11:57:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60F9337B405; Mon, 6 Jan 2003 11:57:46 -0800 (PST) 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 ECBF737B401 for ; Mon, 6 Jan 2003 11:57:45 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACCCE43E4A for ; Mon, 6 Jan 2003 11:57:45 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 948F52A89E; Mon, 6 Jan 2003 11:57:45 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23251 for review In-Reply-To: <20030106192423.GA619@dhcp01.pn.xcllnt.net> Date: Mon, 06 Jan 2003 11:57:45 -0800 From: Peter Wemm Message-Id: <20030106195745.948F52A89E@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Mon, Jan 06, 2003 at 08:16:48AM -0800, Peter Wemm wrote: > > > > Anyway, moving the dashutdown calls to before the device tree is shot down > > solved the problem. It now cleanly reboots with mpt and acpica. > > > > Cool! > > BTW: If you think the machine is ready for more heavy duty (from an > administrator point of view), let Kris know. Maybe we have a couple > of full ports builds before 5.0-R. I'm interested to see if anything > actually breaks due to a 64-bit time_t and how deep the int->ptr > cast bites us. I think it should be safe now. The console stuff is working nicely, thank you very much. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:22:12 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96A8237B405; Mon, 6 Jan 2003 12:22:09 -0800 (PST) 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 35E9B37B401 for ; Mon, 6 Jan 2003 12:22:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E030543EB2 for ; Mon, 6 Jan 2003 12:22:08 -0800 (PST) (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 h06KM8fh097261 for ; Mon, 6 Jan 2003 12:22:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KM8tp097253 for perforce@freebsd.org; Mon, 6 Jan 2003 12:22:08 -0800 (PST) Date: Mon, 6 Jan 2003 12:22:08 -0800 (PST) Message-Id: <200301062022.h06KM8tp097253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23294 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23294 Change 23294 by peter@peter_itanic2 on 2003/01/06 12:21:24 fix segfaults on ia64. Affected files ... .. //depot/projects/ia64/sbin/slattach/slattach.c#4 edit Differences ... ==== //depot/projects/ia64/sbin/slattach/slattach.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -131,7 +131,7 @@ slflags &= ~IFF_LINK2; break; case 'e': - exit_cmd = (char*) strdup (optarg); + exit_cmd = strdup (optarg); break; case 'f': foreground = 1; @@ -146,13 +146,13 @@ slflags |= IFF_LINK1; break; case 'r': - redial_cmd = (char*) strdup (optarg); + redial_cmd = strdup (optarg); break; case 's': speed = atoi(optarg); break; case 'u': - config_cmd = (char*) strdup (optarg); + config_cmd = strdup (optarg); break; case 'z': redial_on_startup = 1; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:22:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C37437B401; Mon, 6 Jan 2003 12:22:10 -0800 (PST) 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 E28CA37B41A for ; Mon, 6 Jan 2003 12:22:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 950B443EC5 for ; Mon, 6 Jan 2003 12:22:09 -0800 (PST) (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 h06KM9fh097281 for ; Mon, 6 Jan 2003 12:22:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KM8ML097268 for perforce@freebsd.org; Mon, 6 Jan 2003 12:22:08 -0800 (PST) Date: Mon, 6 Jan 2003 12:22:08 -0800 (PST) Message-Id: <200301062022.h06KM8ML097268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23295 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23295 Change 23295 by peter@peter_itanic2 on 2003/01/06 12:21:49 fix warnings (indistinguishable from real problems) Affected files ... .. //depot/projects/ia64/contrib/bind/lib/isc/ctl_clnt.c#3 edit .. //depot/projects/ia64/contrib/bind/lib/isc/ctl_srvr.c#3 edit Differences ... ==== //depot/projects/ia64/contrib/bind/lib/isc/ctl_clnt.c#3 (text+ko) ==== @@ -185,7 +185,7 @@ if (evConnect(lev, ctx->sock, (const struct sockaddr *)sap, sap_len, conn_done, ctx, &ctx->coID) < 0) { (*ctx->logger)(ctl_error, "%s: evConnect(fd %d): %s", - me, (void *)ctx->sock, strerror(errno)); + me, (void *)(uintptr_t)ctx->sock, strerror(errno)); fatal: if (ctx != NULL) { if (ctx->sock >= 0) ==== //depot/projects/ia64/contrib/bind/lib/isc/ctl_srvr.c#3 (text+ko) ==== @@ -252,7 +252,7 @@ &ctx->acID) < 0) { save_errno = errno; (*ctx->logger)(ctl_error, "%s: evListen(fd %d): %s", - me, (void *)ctx->sock, strerror(errno)); + me, (void *)(uintptr_t)ctx->sock, strerror(errno)); close(ctx->sock); memput(ctx, sizeof *ctx); errno = save_errno; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:22:15 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E85A37B406; Mon, 6 Jan 2003 12:22:11 -0800 (PST) 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 C3BE137B417 for ; Mon, 6 Jan 2003 12:22:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E77E43EC5 for ; Mon, 6 Jan 2003 12:22:10 -0800 (PST) (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 h06KMAfh097306 for ; Mon, 6 Jan 2003 12:22:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KM9YI097291 for perforce@freebsd.org; Mon, 6 Jan 2003 12:22:09 -0800 (PST) Date: Mon, 6 Jan 2003 12:22:09 -0800 (PST) Message-Id: <200301062022.h06KM9YI097291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23296 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23296 Change 23296 by peter@peter_itanic2 on 2003/01/06 12:22:07 fix segfault Affected files ... .. //depot/projects/ia64/contrib/diff/prepend_args.c#2 edit Differences ... ==== //depot/projects/ia64/contrib/diff/prepend_args.c#2 (text+ko) ==== @@ -23,6 +23,7 @@ # include #endif #include "system.h" +#include "diff.h" #include "prepend_args.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:23:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1807137B405; Mon, 6 Jan 2003 12:23:13 -0800 (PST) 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 BCC4937B401 for ; Mon, 6 Jan 2003 12:23:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F5A743EB2 for ; Mon, 6 Jan 2003 12:23:12 -0800 (PST) (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 h06KNCfh097348 for ; Mon, 6 Jan 2003 12:23:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KNBmw097345 for perforce@freebsd.org; Mon, 6 Jan 2003 12:23:11 -0800 (PST) Date: Mon, 6 Jan 2003 12:23:11 -0800 (PST) Message-Id: <200301062023.h06KNBmw097345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23297 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23297 Change 23297 by peter@peter_itanic2 on 2003/01/06 12:22:28 fix warning (indistinguishable from real problems) Affected files ... .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#7 edit Differences ... ==== //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#7 (text+ko) ==== @@ -505,7 +505,7 @@ mi_thread_handle_wrapper(arg) void *arg; { - return (void *) mi_handle_session(arg); + return (void *)(uintptr_t) mi_handle_session(arg); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:41:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EE4C37B405; Mon, 6 Jan 2003 12:41:39 -0800 (PST) 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 261C437B401 for ; Mon, 6 Jan 2003 12:41:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D58D343EE6 for ; Mon, 6 Jan 2003 12:41:36 -0800 (PST) (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 h06Kfafh004710 for ; Mon, 6 Jan 2003 12:41:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KfaQK004683 for perforce@freebsd.org; Mon, 6 Jan 2003 12:41:36 -0800 (PST) Date: Mon, 6 Jan 2003 12:41:36 -0800 (PST) Message-Id: <200301062041.h06KfaQK004683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23300 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23300 Change 23300 by peter@peter_itanic2 on 2003/01/06 12:41:12 fix segfault on ia64 (undeclared realloc()) - I have a suspicion that this may be the cause of sshd segfaulting on pluto1 Affected files ... .. //depot/projects/ia64/contrib/com_err/getarg.c#2 edit Differences ... ==== //depot/projects/ia64/contrib/com_err/getarg.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include "getarg.h" #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:42:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D3A537B405; Mon, 6 Jan 2003 12:42:39 -0800 (PST) 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 24CF337B401 for ; Mon, 6 Jan 2003 12:42:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0F1043EA9 for ; Mon, 6 Jan 2003 12:42:38 -0800 (PST) (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 h06Kgcfh004841 for ; Mon, 6 Jan 2003 12:42:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06Kgceh004838 for perforce@freebsd.org; Mon, 6 Jan 2003 12:42:38 -0800 (PST) Date: Mon, 6 Jan 2003 12:42:38 -0800 (PST) Message-Id: <200301062042.h06Kgceh004838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23301 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23301 Change 23301 by peter@peter_itanic2 on 2003/01/06 12:41:46 "fix" warnings with a big hammer - ugh. Affected files ... .. //depot/projects/ia64/usr.bin/window/main.c#2 edit Differences ... ==== //depot/projects/ia64/usr.bin/window/main.c#2 (text+ko) ==== @@ -55,6 +55,8 @@ #include "char.h" #include "local.h" +void *usage(void); + #define next(a) (*++*(a) ? *(a) : (*++(a) ? *(a) : (char *)usage())) /*ARGSUSED*/ @@ -199,9 +201,10 @@ return 0; } +void * usage() { (void) fprintf(stderr, "usage: window [-e escape-char] [-c command] [-t] [-f] [-d]\n"); exit(1); - return 0; /* for lint */ + return NULL; /* for lint */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 12:42:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1C8937B401; Mon, 6 Jan 2003 12:42:40 -0800 (PST) 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 B7CF137B413 for ; Mon, 6 Jan 2003 12:42:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68E5243EA9 for ; Mon, 6 Jan 2003 12:42:39 -0800 (PST) (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 h06Kgdfh004848 for ; Mon, 6 Jan 2003 12:42:39 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06KgcpC004844 for perforce@freebsd.org; Mon, 6 Jan 2003 12:42:38 -0800 (PST) Date: Mon, 6 Jan 2003 12:42:38 -0800 (PST) Message-Id: <200301062042.h06KgcpC004844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23302 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23302 Change 23302 by peter@peter_itanic2 on 2003/01/06 12:42:28 fix warnings. sigh. Why use a struct when you really want an int? Affected files ... .. //depot/projects/ia64/contrib/bind/bin/host/host.c#5 edit Differences ... ==== //depot/projects/ia64/contrib/bind/bin/host/host.c#5 (text+ko) ==== @@ -226,7 +226,7 @@ int main(int argc, char **argv) { struct sockaddr_storage addr; - struct hostent *hp; + int hp; char *s; int waitmode = 0; int ncnames, ch; @@ -383,7 +383,7 @@ } freeaddrinfo(answer); } - hp = NULL; + hp = 0; res.res_h_errno = TRY_AGAIN; /* * We handle default domains ourselves, thank you. @@ -393,10 +393,10 @@ if (list) exit(ListHosts(getdomain, querytype ? querytype : ns_t_a)); ncnames = 5; nkeychains = 18; - while (hp == NULL && res.res_h_errno == TRY_AGAIN) { + while (hp == 0 && res.res_h_errno == TRY_AGAIN) { if (!ip) { cname = NULL; - hp = (struct hostent *)gethostinfo(getdomain); + hp = gethostinfo(getdomain); getdomain[0] = 0; /* clear this query */ if (sigchase && (chase_step & SD_RR)) { if (nkeychains-- == 0) { @@ -437,21 +437,21 @@ sym_ntos(__p_type_syms, chase_type, NULL), getdomain); } - hp = NULL; + hp = 0; res.res_h_errno = TRY_AGAIN; continue; } } else { if (addrinfo(&addr) == 0) - hp = NULL; + hp = 0; else - hp = (struct hostent *)1; /* XXX */ + hp = 1; /* XXX */ } if (!waitmode) break; } - if (hp == NULL) { + if (hp == 0) { hperror(res.res_h_errno); exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 13: 3: 9 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DBCC37B405; Mon, 6 Jan 2003 13:03:07 -0800 (PST) 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 CD38737B401 for ; Mon, 6 Jan 2003 13:03:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DDA943EA9 for ; Mon, 6 Jan 2003 13:03:06 -0800 (PST) (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 h06L36fh012237 for ; Mon, 6 Jan 2003 13:03:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06L35V1012234 for perforce@freebsd.org; Mon, 6 Jan 2003 13:03:05 -0800 (PST) Date: Mon, 6 Jan 2003 13:03:05 -0800 (PST) Message-Id: <200301062103.h06L35V1012234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23304 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23304 Change 23304 by peter@peter_itanic2 on 2003/01/06 13:02:16 fix warnings. Why is this being compiled on !i386 anyway?? Affected files ... .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#6 edit Differences ... ==== //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#6 (text+ko) ==== @@ -911,7 +911,7 @@ if (sp->flags & MEM_ASSIGNED) { mem.window = 0; mem.flags = sp->mem.flags; - mem.start = (caddr_t) sp->mem.addr; + mem.start = (caddr_t)(uintptr_t) sp->mem.addr; mem.card = sp->mem.cardaddr; mem.size = sp->mem.size; if (ioctl(sp->fd, PIOCSMEM, &mem)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 13: 3:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59DA537B401; Mon, 6 Jan 2003 13:03:08 -0800 (PST) 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 769BE37B418 for ; Mon, 6 Jan 2003 13:03:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2779C43EA9 for ; Mon, 6 Jan 2003 13:03:07 -0800 (PST) (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 h06L36fh012243 for ; Mon, 6 Jan 2003 13:03:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06L36RD012240 for perforce@freebsd.org; Mon, 6 Jan 2003 13:03:06 -0800 (PST) Date: Mon, 6 Jan 2003 13:03:06 -0800 (PST) Message-Id: <200301062103.h06L36RD012240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23305 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23305 Change 23305 by peter@peter_itanic2 on 2003/01/06 13:02:30 fix warnings Affected files ... .. //depot/projects/ia64/usr.sbin/sysinstall/dmenu.c#2 edit Differences ... ==== //depot/projects/ia64/usr.sbin/sysinstall/dmenu.c#2 (text+ko) ==== @@ -288,15 +288,15 @@ /* Pop up that dialog! */ if (menu->type & DMENU_NORMAL_TYPE) rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons, choice, scroll); + menu_height(menu, n), -n, items, (char *)(uintptr_t)buttons, choice, scroll); else if (menu->type & DMENU_RADIO_TYPE) rval = dialog_radiolist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons); + menu_height(menu, n), -n, items, (char *)(uintptr_t)buttons); else if (menu->type & DMENU_CHECKLIST_TYPE) rval = dialog_checklist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1, - menu_height(menu, n), -n, items, (char *)buttons); + menu_height(menu, n), -n, items, (char *)(uintptr_t)buttons); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); if (exited) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 13: 4:11 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C767A37B405; Mon, 6 Jan 2003 13:04:09 -0800 (PST) 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 6079537B401 for ; Mon, 6 Jan 2003 13:04:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1649443EC2 for ; Mon, 6 Jan 2003 13:04:09 -0800 (PST) (envelope-from green@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 h06L48fh012266 for ; Mon, 6 Jan 2003 13:04:08 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06L48xw012263 for perforce@freebsd.org; Mon, 6 Jan 2003 13:04:08 -0800 (PST) Date: Mon, 6 Jan 2003 13:04:08 -0800 (PST) Message-Id: <200301062104.h06L48xw012263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23306 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23306 Change 23306 by green@green_laptop_2 on 2003/01/06 13:03:34 Make execution of all the mount_.* programs work properly by applying the same sebsd/system_u:object_r:mount_exec_t to all of them and allowing mount_t's to execute eachother. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/mount.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/mount.fc#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/mount.te#2 (text+ko) ==== @@ -57,4 +57,5 @@ `can_udp_send(mount_t, portmap_t) can_udp_send(portmap_t, mount_t)') - +# Access sub-mount(8) commands +allow mount_t mount_exec_t:file { execute_no_trans }; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/mount.fc#3 (text+ko) ==== @@ -1,3 +1,3 @@ # mount -/sbin/mount* system_u:object_r:mount_exec_t +/sbin/mount(_.*)? system_u:object_r:mount_exec_t /sbin/umount system_u:object_r:mount_exec_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 13: 8:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C462B37B405; Mon, 6 Jan 2003 13:08:16 -0800 (PST) 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 5C03B37B401 for ; Mon, 6 Jan 2003 13:08:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B565843EA9 for ; Mon, 6 Jan 2003 13:08:15 -0800 (PST) (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 h06L8Ffh012463 for ; Mon, 6 Jan 2003 13:08:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06L8FuC012460 for perforce@freebsd.org; Mon, 6 Jan 2003 13:08:15 -0800 (PST) Date: Mon, 6 Jan 2003 13:08:15 -0800 (PST) Message-Id: <200301062108.h06L8FuC012460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23308 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23308 Change 23308 by peter@peter_itanic2 on 2003/01/06 13:07:40 stop tcpd from segfaulting on ia64. (argh! when will this end?) Affected files ... .. //depot/projects/ia64/contrib/tcp_wrappers/inetcf.c#2 edit Differences ... ==== //depot/projects/ia64/contrib/tcp_wrappers/inetcf.c#2 (text+ko) ==== @@ -17,6 +17,7 @@ extern int errno; extern void exit(); +extern char *malloc(); #include "tcpd.h" #include "inetcf.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 13: 8:19 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E874837B408; Mon, 6 Jan 2003 13:08:17 -0800 (PST) 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 7F91D37B433 for ; Mon, 6 Jan 2003 13:08:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4905743ED1 for ; Mon, 6 Jan 2003 13:08:16 -0800 (PST) (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 h06L8Gfh012469 for ; Mon, 6 Jan 2003 13:08:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h06L8Ftn012466 for perforce@freebsd.org; Mon, 6 Jan 2003 13:08:15 -0800 (PST) Date: Mon, 6 Jan 2003 13:08:15 -0800 (PST) Message-Id: <200301062108.h06L8Ftn012466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23309 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23309 Change 23309 by peter@peter_itanic2 on 2003/01/06 13:07:59 stop tcpdump segfaulting on ia64 (argh! another one!) Affected files ... .. //depot/projects/ia64/contrib/tcpdump/print-esp.c#3 edit Differences ... ==== //depot/projects/ia64/contrib/tcpdump/print-esp.c#3 (text+ko) ==== @@ -50,6 +50,7 @@ #endif #include +#include #include "ip.h" #include "esp.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jan 6 18:41:39 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A471437B405; Mon, 6 Jan 2003 18:41:37 -0800 (PST) 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 47BF337B406 for ; Mon, 6 Jan 2003 18:41:37 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 082BB43ED1 for ; Mon, 6 Jan 2003 18:41:37 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 6BE8E2A89E for ; Mon, 6 Jan 2003 18:41:33 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Perforce Change Reviews Subject: Re: PERFORCE change 23300 for review In-Reply-To: <200301062041.h06KfaQK004683@repoman.freebsd.org> Date: Mon, 06 Jan 2003 18:41:33 -0800 From: Peter Wemm Message-Id: <20030107024133.6BE8E2A89E@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=23300 > > Change 23300 by peter@peter_itanic2 on 2003/01/06 12:41:12 > > fix segfault on ia64 (undeclared realloc()) - I have a suspicion > that this may be the cause of sshd segfaulting on pluto1 > > Affected files ... > > .. //depot/projects/ia64/contrib/com_err/getarg.c#2 edit > > Differences ... > > ==== //depot/projects/ia64/contrib/com_err/getarg.c#2 (text+ko) ==== > > @@ -43,6 +43,7 @@ > #include > #include > #include > +#include > #include "getarg.h" > > #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag) Yes, this appears to fix ssh -2 when connecting to pluto1.freebsd.org. Or maybe it was fixed some other way in the last 2 weeks. privsep still blows up though. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 5:28:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04C5637B405; Tue, 7 Jan 2003 05:28:27 -0800 (PST) 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 A897637B401 for ; Tue, 7 Jan 2003 05:28:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6492D43F0A for ; Tue, 7 Jan 2003 05:28:26 -0800 (PST) (envelope-from green@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 h07DSQfh065219 for ; Tue, 7 Jan 2003 05:28:26 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h07DSPvb065216 for perforce@freebsd.org; Tue, 7 Jan 2003 05:28:25 -0800 (PST) Date: Tue, 7 Jan 2003 05:28:25 -0800 (PST) Message-Id: <200301071328.h07DSPvb065216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23337 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23337 Change 23337 by green@green_laptop_2 on 2003/01/07 05:28:08 Add a tunable (os-dependent, that is) to avc/avc.c which allows you to enable enforcement mode from the boot loader. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#13 (text+ko) ==== @@ -235,6 +235,11 @@ if (!avc_audit_buffer) panic("AVC: unable to allocate audit buffer\n"); mtx_init(&avc_lock, "SEBSD AVC", NULL, MTX_DEF); + /* The fetch may or may not occur; if not, it doesn't change int *. */ + avc_debug_always_allow = !avc_debug_always_allow; + TUNABLE_INT_FETCH("security.mac.sebsd.enforcing", + &avc_debug_always_allow); + avc_debug_always_allow = !avc_debug_always_allow; } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 6:30:45 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A14F737B405; Tue, 7 Jan 2003 06:30:43 -0800 (PST) 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 3C7EF37B401 for ; Tue, 7 Jan 2003 06:30:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D907843EA9 for ; Tue, 7 Jan 2003 06:30:42 -0800 (PST) (envelope-from green@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 h07EUgfh088574 for ; Tue, 7 Jan 2003 06:30:42 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h07EUgTB088558 for perforce@freebsd.org; Tue, 7 Jan 2003 06:30:42 -0800 (PST) Date: Tue, 7 Jan 2003 06:30:42 -0800 (PST) Message-Id: <200301071430.h07EUgTB088558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23339 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23339 Change 23339 by green@green_laptop_2 on 2003/01/07 06:30:11 Correct vn_open.*() so that nameidata.ni_vp is reset to NULL upon failure before returning. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#58 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#58 (text+ko) ==== @@ -276,6 +276,7 @@ NDFREE(ndp, NDF_ONLY_PNBUF); vput(vp); *flagp = fmode; + ndp->ni_vp = NULL; return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 6:45: 4 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B9737B405; Tue, 7 Jan 2003 06:45:01 -0800 (PST) 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 168DF37B401 for ; Tue, 7 Jan 2003 06:45:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C0D43EB2 for ; Tue, 7 Jan 2003 06:45:00 -0800 (PST) (envelope-from green@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 h07Ej0fh093932 for ; Tue, 7 Jan 2003 06:45:00 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h07Ej0UF093929 for perforce@freebsd.org; Tue, 7 Jan 2003 06:45:00 -0800 (PST) Date: Tue, 7 Jan 2003 06:45:00 -0800 (PST) Message-Id: <200301071445.h07Ej0UF093929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23340 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23340 Change 23340 by green@green_laptop_2 on 2003/01/07 06:44:20 Remove some unnecessary code. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#11 (text+ko) ==== @@ -289,7 +289,6 @@ AVC_AUDITDENY, auditdata); -#ifndef __TBD_CDV__ if (avc_debug_always_allow) { ae->allowed |= requested; mtx_unlock(&avc_lock); @@ -298,10 +297,6 @@ mtx_unlock(&avc_lock); return -EACCES; } -#else /* __TBD_CDV__ */ - mtx_unlock(&avc_lock); - return -EACCES; -#endif /* __TBD_CDV__ */ } if (requested & ae->auditallow) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 8: 5:42 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89ECA37B405; Tue, 7 Jan 2003 08:05:40 -0800 (PST) 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 2D76D37B401 for ; Tue, 7 Jan 2003 08:05:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4D9143E4A for ; Tue, 7 Jan 2003 08:05:39 -0800 (PST) (envelope-from green@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 h07G5dfh022660 for ; Tue, 7 Jan 2003 08:05:39 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h07G5d90022657 for perforce@freebsd.org; Tue, 7 Jan 2003 08:05:39 -0800 (PST) Date: Tue, 7 Jan 2003 08:05:39 -0800 (PST) Message-Id: <200301071605.h07G5d90022657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23341 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23341 Change 23341 by green@green_laptop_2 on 2003/01/07 08:05:08 Sometimes, you really need setfsmac(8) on the root filesystem to create labels you can't otherwise create. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/Makefile#13 edit .. //depot/projects/trustedbsd/mac/sbin/setfmac/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sbin/Makefile#13 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 9: 2:17 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A30237B405; Tue, 7 Jan 2003 09:01:52 -0800 (PST) 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 26A8237B401 for ; Tue, 7 Jan 2003 09:01:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3666343ED4 for ; Tue, 7 Jan 2003 09:01:50 -0800 (PST) (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 h07H1ofh044062 for ; Tue, 7 Jan 2003 09:01:50 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h07H1mqM043983 for perforce@freebsd.org; Tue, 7 Jan 2003 09:01:48 -0800 (PST) Date: Tue, 7 Jan 2003 09:01:48 -0800 (PST) Message-Id: <200301071701.h07H1mqM043983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 23343 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23343 Change 23343 by jhb@jhb_laptop on 2003/01/07 09:01:39 IFC @23338. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/smpng/sys/conf/files#60 integrate .. //depot/projects/smpng/sys/conf/files.ia64#22 integrate .. //depot/projects/smpng/sys/conf/ldscript.i386#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirebusreg.h#2 delete .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#4 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#4 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#5 integrate .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/wi_hostap.c#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.h#3 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#6 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#13 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/smpng/sys/ia64/acpica/madt.c#8 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.s#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#41 integrate .. //depot/projects/smpng/sys/ia64/ia64/sapic.c#11 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#15 integrate .. //depot/projects/smpng/sys/ia64/include/intr.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/intrcnt.h#3 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#25 integrate .. //depot/projects/smpng/sys/kern/imgact_elf32.c#2 integrate .. //depot/projects/smpng/sys/kern/imgact_elf64.c#2 integrate .. //depot/projects/smpng/sys/kern/imgact_elfN.c#2 delete .. //depot/projects/smpng/sys/kern/init_main.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_disklabel.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_diskmbr.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#16 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#24 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#12 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#50 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#12 integrate .. //depot/projects/smpng/sys/modules/firewire/firewire/Makefile#5 integrate .. //depot/projects/smpng/sys/net/if_loop.c#13 integrate .. //depot/projects/smpng/sys/net/if_stf.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#10 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#9 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#16 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#19 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/diskslice_machdep.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#17 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#26 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#20 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#17 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/atomic.S#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/ofwmagic.S#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#1 branch .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/iommureg.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#16 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#6 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#32 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#26 integrate .. //depot/projects/smpng/sys/sys/buf.h#14 integrate .. //depot/projects/smpng/sys/sys/ccdvar.h#4 integrate .. //depot/projects/smpng/sys/sys/conf.h#18 integrate .. //depot/projects/smpng/sys/sys/copyright.h#4 integrate .. //depot/projects/smpng/sys/sys/diskpc98.h#3 integrate .. //depot/projects/smpng/sys/sys/dmap.h#3 delete .. //depot/projects/smpng/sys/sys/exec.h#3 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#16 integrate .. //depot/projects/smpng/sys/sys/proc.h#69 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#15 integrate .. //depot/projects/smpng/sys/sys/syslimits.h#5 integrate .. //depot/projects/smpng/sys/sys/systm.h#36 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#24 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#22 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#10 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#19 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#3 (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/alpha/alpha/dump_machdep.c,v 1.2 2002/08/31 03:21:59 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.3 2003/01/03 00:19:54 ticso Exp $ */ #include @@ -73,6 +73,18 @@ strncpy(kdh.panicstring, panicstr, sizeof kdh.panicstring); kdh.parity = kerneldump_parity(&kdh); + /* + * Check if we will have enough room to save the coredump. + * The partition size needed is the sum of: + * Memory to save + header + trailer + Room to leave untouched + * at partition head. (an arbitrary amount). + */ + if (di->mediasize < + Maxmem * (off_t)PAGE_SIZE + sizeof kdh * 2 + 64*1024) { + printf("\nDump failed. Partition too small.\n"); + return; + } + dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE; dumplo -= sizeof kdh * 2; i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); ==== //depot/projects/smpng/sys/boot/pc98/boot2/bios.S#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.3 2001/05/24 11:18:32 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.4 2003/01/06 13:43:13 nyan Exp $ */ /* @@ -94,6 +94,26 @@ #ifndef CDBOOT /* + * PC-9801/PC-9821 SCSI MO booting + * 2002/06/05-07/03 Kawanobe Koh + * + */ +scsi_hd: + .code16 + push %cx + push %ds + mov %bl, %cl /* UA */ + and $0x0F, %cl + xor %ax, %ax + mov %ax, %ds + mov (0x0482), %al /* SCSI HD equipment bits */ + shr %cl, %al + pop %ds + pop %cx + test $1, %al + ret + +/* * biosread(dev, cyl, head, sec, nsec, offset) * Read "nsec" sectors from disk to offset "offset" in boot segment * BIOS call "INT 0x1B Function 0xn6" to read sectors from disk into memory @@ -118,54 +138,58 @@ push %esi push %edi - movb 0x14(%ebp), %dl /* sector */ - movb 0x10(%ebp), %dh /* head */ - movw 0x0c(%ebp), %cx /* cylinder */ - movb 0x08(%ebp), %al /* DA/UA */ - movb $0x06, %ah - andb $0xf0, %al - cmpb $0x30, %al - jz fd - cmpb $0x90, %al - jnz 1f -fd: - incb %dl - movb $0x02, %ch - movb $0xd6, %ah -1: - movb 0x08(%ebp), %al - movl %eax, %ebx + mov 0x08(%ebp), %bl /* (byte) DA/UA */ + mov 0x0C(%ebp), %ecx /* (word) cylinder */ + mov 0x10(%ebp), %dh /* (byte) head */ + mov 0x14(%ebp), %dl /* (byte) sector */ + mov 0x18(%ebp), %esi /* (byte) number of sectors */ + mov 0x1C(%ebp), %edi /* (word) destination offset */ /* prot_to_real will set %es to BOOTSEG */ call EXT(prot_to_real) /* enter real mode */ - mov %ebx, %eax - xor %ebx, %ebx - addr32 - movb 0x18(%ebp), %bl /* number of sectors */ .code16 - shl $9, %ebx - push %ebx - .code32 - addr32 - data32 - mov 0x1c(%ebp), %ebx - .code16 - mov %ebx, %ebp - pop %ebx + mov $0x06, %bh /* read data function */ + mov %bl, %al /* DA */ + and $0xF0, %al + cmp $0x30, %al /* 1440KB FD */ + jz read_floppy + cmp $0x90, %al /* 1200KB FD */ + jz read_floppy + cmp $0xA0, %al /* SCSI HD or MO */ + jnz read_next + call scsi_hd + jnz read_next +read_linear: + mov %dh, %al /* change to linear sector */ + shl $5, %al /* multiply by 32 sector per track */ + add %dl, %al + xor %dh, %dh /* higher 16 bits into %dx */ + mov %ch, %dl + mov %cl, %ch /* lower 16 bits into %cx */ + mov %al, %cl + and $0x7F, %bl /* linear access DA/UA */ + jmp read_next +read_floppy: + inc %dx /* sector address begins from one */ + mov $0x02, %ch /* 512 bytes sector */ + mov $0xD6, %bh /* MT MFM retry seek */ +read_next: + mov %si, %ax /* number of sectors */ + shl $9, %ax /* multiply by 512 bytes */ + xchg %bx, %ax + mov %di, %bp /* destination offset */ + int $0x1B /* disk bios call */ + jc read_end + xor %ax, %ax +read_end: + mov %ax, %bx /* save return value */ - int $0x1b - jc 1f .code32 - xor %eax, %eax -1: - /* save return value (actually movw %ax, %bx) */ - mov %eax, %ebx - data32 call EXT(real_to_prot) /* back to protected mode */ xor %eax, %eax - movb %bh, %al /* return value in %ax */ + mov %bh, %al /* return value in %eax */ pop %edi pop %esi @@ -360,46 +384,61 @@ push %ebp mov %esp, %ebp push %ebx - push %esi - push %edi + + mov 0x08(%ebp), %bl /* (byte) DA/UA */ - movb 0x8(%ebp), %dl /* diskinfo(drive #) */ call EXT(prot_to_real) /* enter real mode */ .code16 + mov %bl, %al /* DA */ + and $0xf0, %al + mov $18, %dl /* 1440KB FD sectors per track */ + cmp $0x30, %al + jz floppy + mov $15, %dl /* 1200KB FD sectors per track */ + cmp $0x90, %al + jz floppy + cmp $0xA0, %al /* SCSI HD or MO */ + jnz sense + call scsi_hd + jnz sense - movb %dl, %al /* ask for disk info */ - andb $0xf0, %al - cmpb $0x30, %al - jz fdd4 - cmpb $0x90, %al - jz fdd + push %ds /* SCSI MO or CD ? */ + xor %ax, %ax + mov %ax, %ds + and $0x0F, %bx /* UA */ + shl $2, %bx /* parameter offset */ + add $0x0460, %bx + mov (%bx), %al /* SCSI equipment parameter[0] */ + and $0x1F, %al /* peripheral device type */ + cmp $7, %al /* SCSI MO */ + jnz good + add $3, %bx + mov (%bx), %al /* SCSI equipment parameter[3] */ + test $0x30, %al /* sector length from 256 to 2048 */ + jnz good + or $0x10, %al /* forced set 512 bytes sector */ + mov %al, (%bx) + mov $0xA100, %dx /* refered by C language */ + mov %dx, %ds + mov %al, (%bx) +good: + pop %ds - movb %dl, %al - movb $0x84, %ah - + mov $0xFFFE, %cx /* virtual 65535 cylinders setting */ + mov $0x0820, %dx /* standard 8 heads and 32 sectors */ + jmp ok +sense: + mov $0x84, %ah /* ask for disk info */ + mov %bl, %al int $0x1b - - jnc ok + jnc ok /* use %cx and %dx after */ /* * Urk. Call failed. It is not supported for floppies by old BIOS's. * Guess it's a 15-sector floppy. */ -fdd4: - movb $18, %dl - jmp 1f -fdd: - movb $15, %dl /* max sector */ -1: - subb %ah, %ah /* %ax = 0 */ - movb %al, %al - movb %ah, %bh /* %bh = 0 */ - movb $2, %bl /* %bl bits 0-3 = drive type, - bit 2 = 1.2M */ - movb $79, %ch /* max track */ - movb $1, %cl /* # floppy drives installed */ - movb $2, %dh /* max head */ - /* es:di = parameter table */ - /* carry = 0 */ +floppy: + mov $79, %cx /* 80 cylinders 1200K and 1440K FD */ + mov $2, %dh /* 2 heads as double side */ ok: .code32 data32 @@ -412,12 +451,9 @@ * 8 bit sector */ mov %ecx, %eax - sall $16,%eax /* << 16 */ - movb %dh, %ah /* max head */ - movb %dl, %al /* max sector (and # sectors) */ + sal $16, %eax /* max cylinder number from zero */ + mov %dx, %ax /* number of heads and sectors */ - pop %edi - pop %esi pop %ebx pop %ebp ret ==== //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.9 2002/10/03 16:20:14 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.10 2003/01/06 13:43:13 nyan Exp $ */ @@ -118,11 +118,16 @@ dosdev = drive; #ifdef PC98 maj = (drive&0x70) >> 3; /* a good first bet */ - if (maj == 4) { /* sd */ + if (maj == 4) { /* da */ disk_equips = *(unsigned char *)V(0xA1482); unit = 0; for (i=0; i<(drive&0x0f); i++) { - unit += (disk_equips >> i) & 1; + int media = ((unsigned *)V(0xA1460))[i] & 0x1F; + + if ((disk_equips >> i) & 1) /* HD */ + unit++; + else if (media == 7) /* MO */ + unit++; } } else { unit = drive & 0x0f; ==== //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.6 2002/10/03 16:20:14 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.8 2003/01/06 13:43:13 nyan Exp $ */ /* @@ -77,7 +77,7 @@ int devopen(void) { - struct dos_partition *dptr; + struct pc98_partition *dptr; struct disklabel *dl; char *p; int i, sector = 0, di, dosdev_copy; @@ -99,7 +99,7 @@ #else /* EMBEDDED_DISKLABEL */ #ifdef PC98 p = Bread(dosdev_copy, 1); - dptr = (struct dos_partition *)p; + dptr = (struct pc98_partition *)p; slice = WHOLE_DISK_SLICE; for (i = 0; i < NDOSPART; i++, dptr++) if (dptr->dp_mid == DOSPTYP_386BSD) { @@ -129,17 +129,6 @@ printf("bad disklabel\n"); return 1; } - if( (maj == 4) || (maj == 0) || (maj == 1)) - { - if (dl->d_type == DTYPE_SCSI) - { - maj = 4; /* use scsi as boot dev */ - } - else - { - maj = 0; /* must be ESDI/IDE */ - } - } /* This little trick is for OnTrack DiskManager disks */ boff = dl->d_partitions[part].p_offset - dl->d_partitions[2].p_offset + sector; ==== //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.2 1999/08/28 00:40:26 peter Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.3 2003/01/06 13:43:14 nyan Exp $ */ /* @@ -275,8 +275,8 @@ switch(maj) { #ifdef PC98 - case 4: /* sd */ - dosdev_copy = biosdrive | 0xa0; + case 4: /* da */ + dosdev_copy = biosdrive | 0xA0; /* SCSI HD or MO */ #else /* IBM-PC */ case 0: case 4: @@ -284,8 +284,8 @@ #endif break; #ifdef PC98 - case 0: - case 2: + case 0: /* wd */ + case 2: /* 1200KB fd */ dosdev_copy = (maj << 3) | unit | 0x80; #else case 2: @@ -293,7 +293,7 @@ #endif break; #ifdef PC98 - case 6:/* 1.44MB FD */ + case 6: /* 1440KB fd */ dosdev_copy = (maj << 3) | unit; break; #endif ==== //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#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/boot/pc98/libpc98/biosdisk.c,v 1.19 2002/10/07 15:26:10 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.21 2003/01/06 13:43:15 nyan Exp $ */ /* @@ -81,9 +81,12 @@ #define BD_FLOPPY 0x0004 #define BD_LABELOK 0x0008 #define BD_PARTTABOK 0x0010 +#ifdef PC98 +#define BD_OPTICAL 0x0020 +#endif struct disklabel od_disklabel; int od_nslices; /* slice count */ - struct dos_partition od_slicetab[MAX_SLICES]; + struct pc98_partition od_slicetab[MAX_SLICES]; }; /* @@ -109,7 +112,7 @@ static int bd_int13probe(struct bdinfo *bd); -static void bd_printslice(struct open_disk *od, struct dos_partition *dp, +static void bd_printslice(struct open_disk *od, struct pc98_partition *dp, char *prefix, int verbose); static void bd_printbsdslice(struct open_disk *od, daddr_t offset, char *prefix, int verbose); @@ -198,7 +201,7 @@ } } else { - if ((unit & 0xa0) == 0xa0) + if ((unit & 0xF0) == 0xA0) /* SCSI HD or MO */ bdinfo[nbdinfo].bd_da_unit = da_drive++; } /* XXX we need "disk aliases" to make this simpler */ @@ -257,6 +260,14 @@ bd->bd_flags |= BD_MODEINT13; return(1); } + if ((bd->bd_unit & 0xF0) == 0xA0) { + int media = ((unsigned *)PTOV(0xA1460))[bd->bd_unit & 0x0F] & 0x1F; + + if (media == 7) { /* MO */ + bd->bd_flags |= BD_MODEINT13 | BD_OPTICAL; + return(1); + } + } return(0); #else v86.ctl = V86_FLAGS; @@ -298,7 +309,7 @@ char line[80]; struct i386_devdesc dev; struct open_disk *od; - struct dos_partition *dptr; + struct pc98_partition *dptr; for (i = 0; i < nbdinfo; i++) { #ifdef PC98 @@ -523,7 +534,7 @@ static int bd_opendisk(struct open_disk **odp, struct i386_devdesc *dev) { - struct dos_partition *dptr; + struct pc98_partition *dptr; struct disklabel *lp; struct open_disk *od; int sector, slice, i; @@ -605,7 +616,7 @@ * copy the partition table, then pick up any extended partitions. */ bcopy(buf + DOSPARTOFF, &od->od_slicetab, - sizeof(struct dos_partition) * NDOSPART); + sizeof(struct pc98_partition) * NDOSPART); #ifdef PC98 od->od_nslices = NDOSPART; /* extended slices start here */ #else @@ -810,7 +821,7 @@ static int bd_bestslice(struct open_disk *od) { - struct dos_partition *dp; + struct pc98_partition *dp; int pref, preflevel; int i, prefslice; @@ -1081,7 +1092,13 @@ v86.eax = 0x0600 | od->od_unit; v86.ecx = cyl; } - v86.edx = (hd << 8) | sec; + if (od->od_flags & BD_OPTICAL) { + v86.eax &= 0xFF7F; + v86.ecx = dblk & 0xFFFF; + v86.edx = dblk >> 16; + } else { + v86.edx = (hd << 8) | sec; + } v86.ebx = x * BIOSDISK_SECSIZE; v86.es = VTOPSEG(xp); v86.ebp = VTOPOFF(xp); @@ -1362,6 +1379,10 @@ od->od_cyl = 79; od->od_hds = 2; od->od_sec = (od->od_unit & 0xf0) == 0x30 ? 18 : 15; + } else if (od->od_flags & BD_OPTICAL) { + od->od_cyl = 0xFFFE; + od->od_hds = 8; + od->od_sec = 32; } else { v86.ctl = V86_FLAGS; v86.addr = 0x1b; @@ -1423,19 +1444,26 @@ if (*(u_char *)PTOV(addr) & (1 << (unit & 0x0f))) if (hds++ == bunit) break; + + if (unit >= 0xA0) { + int media = ((unsigned *)PTOV(0xA1460))[unit & 0x0F] & 0x1F; + + if (media == 7 && hds++ == bunit) /* SCSI MO */ + return(0xFFFE0820); /* C:65535 H:8 S:32 */ + } if (++unit == 0x84) { - unit = 0xa0; /* SCSI HDD */ + unit = 0xA0; /* SCSI HDD */ addr = 0xA1482; } } if (unit == 0xa7) - return 0x4f010f; + return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ v86.ctl = V86_FLAGS; v86.addr = 0x1b; v86.eax = 0x8400 | unit; v86int(); if (v86.efl & 0x1) - return 0x4f010f; + return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ return ((v86.ecx & 0xffff) << 16) | (v86.edx & 0xffff); #else v86.ctl = V86_FLAGS; ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#30 (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.118 2002/12/18 21:47:52 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.120 2003/01/06 19:30:21 peter Exp $ */ #ifdef _KERNEL ==== //depot/projects/smpng/sys/conf/files#60 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.742 2003/01/01 19:49:29 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.743 2003/01/04 22:07:48 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -966,9 +966,7 @@ isofs/cd9660/cd9660_util.c optional cd9660 isofs/cd9660/cd9660_vfsops.c optional cd9660 isofs/cd9660/cd9660_vnops.c optional cd9660 -kern/imgact_elf32.c standard -kern/imgact_elf64.c standard -kern/imgact_elfN.c standard +kern/imgact_elf.c standard kern/imgact_shell.c standard kern/inflate.c optional gzip kern/init_main.c standard ==== //depot/projects/smpng/sys/conf/files.ia64#22 (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.41 2002/10/24 19:05:03 jhb Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.42 2003/01/04 22:07:48 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -109,6 +109,7 @@ isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/imgact_elf32.c optional ia32 kern/subr_diskmbr.c standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard ==== //depot/projects/smpng/sys/conf/ldscript.i386#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.6 2002/10/11 19:38:04 obrien Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.7 2003/01/06 07:37:15 phk Exp $ */ OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") OUTPUT_ARCH(i386) ENTRY(btext) @@ -65,10 +65,14 @@ CONSTRUCTORS } .data1 : { *(.data1) } + _start_ctors = .; + PROVIDE (start_ctors = .); .ctors : { *(.ctors) } + _stop_ctors = .; + PROVIDE (stop_ctors = .); .dtors : { *(.dtors) ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.25 2002/11/14 23:54:49 sam Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.27 2003/01/07 01:33:03 jdp Exp $ */ /* @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.25 2002/11/14 23:54:49 sam Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.27 2003/01/07 01:33:03 jdp Exp $"; #endif /* @@ -131,6 +131,7 @@ * ID burned into it, though it will always be overriden by the vendor * ID in the EEPROM. Just to be safe, we cover all possibilities. */ +#define BGE_DEVDESC_MAX 64 /* Maximum device description length */ static struct bge_type bge_devs[] = { { ALT_VENDORID, ALT_DEVICEID_BCM5700, @@ -849,7 +850,6 @@ { int i; struct bge_rcb *rcb; - struct bge_rcb_opaque *rcbo; for (i = 0; i < BGE_JUMBO_RX_RING_CNT; i++) { if (bge_newbuf_jumbo(sc, i, NULL) == ENOBUFS) @@ -859,9 +859,8 @@ sc->bge_jumbo = i - 1; rcb = &sc->bge_rdata->bge_info.bge_jumbo_rx_rcb; - rcbo = (struct bge_rcb_opaque *)rcb; - rcb->bge_flags = 0; - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcbo->bge_reg2); + rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, 0); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); CSR_WRITE_4(sc, BGE_MBX_RX_JUMBO_PROD_LO, sc->bge_jumbo); @@ -1066,7 +1065,7 @@ struct bge_softc *sc; { struct bge_rcb *rcb; - struct bge_rcb_opaque *rcbo; + volatile struct bge_rcb *vrcb; int i; /* @@ -1137,17 +1136,15 @@ rcb = &sc->bge_rdata->bge_info.bge_std_rx_rcb; BGE_HOSTADDR(rcb->bge_hostaddr) = vtophys(&sc->bge_rdata->bge_rx_std_ring); - rcb->bge_max_len = BGE_MAX_FRAMELEN; + rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0); if (sc->bge_extram) rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS; else rcb->bge_nicaddr = BGE_STD_RX_RINGS; - rcb->bge_flags = 0; - rcbo = (struct bge_rcb_opaque *)rcb; - CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcbo->bge_reg0); - CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcbo->bge_reg1); - CSR_WRITE_4(sc, BGE_RX_STD_RCB_MAXLEN_FLAGS, rcbo->bge_reg2); - CSR_WRITE_4(sc, BGE_RX_STD_RCB_NICADDR, rcbo->bge_reg3); + CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi); + CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcb->bge_hostaddr.bge_addr_lo); + CSR_WRITE_4(sc, BGE_RX_STD_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); + CSR_WRITE_4(sc, BGE_RX_STD_RCB_NICADDR, rcb->bge_nicaddr); /* * Initialize the jumbo RX ring control block @@ -1159,24 +1156,24 @@ rcb = &sc->bge_rdata->bge_info.bge_jumbo_rx_rcb; BGE_HOSTADDR(rcb->bge_hostaddr) = vtophys(&sc->bge_rdata->bge_rx_jumbo_ring); - rcb->bge_max_len = BGE_MAX_FRAMELEN; + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, BGE_RCB_FLAG_RING_DISABLED); if (sc->bge_extram) rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS; else rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; - rcb->bge_flags = BGE_RCB_FLAG_RING_DISABLED; - - rcbo = (struct bge_rcb_opaque *)rcb; - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, rcbo->bge_reg0); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, rcbo->bge_reg1); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcbo->bge_reg2); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_NICADDR, rcbo->bge_reg3); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, + rcb->bge_hostaddr.bge_addr_hi); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, + rcb->bge_hostaddr.bge_addr_lo); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_NICADDR, rcb->bge_nicaddr); /* Set up dummy disabled mini ring RCB */ rcb = &sc->bge_rdata->bge_info.bge_mini_rx_rcb; - rcb->bge_flags = BGE_RCB_FLAG_RING_DISABLED; - rcbo = (struct bge_rcb_opaque *)rcb; - CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, rcbo->bge_reg2); + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); + CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); /* * Set the BD ring replentish thresholds. The recommended @@ -1191,37 +1188,37 @@ * bit in the flags field of all the TX send ring control blocks. * These are located in NIC memory. */ - rcb = (struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + + vrcb = (volatile struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + BGE_SEND_RING_RCB); for (i = 0; i < BGE_TX_RINGS_EXTSSRAM_MAX; i++) { - rcb->bge_flags = BGE_RCB_FLAG_RING_DISABLED; - rcb->bge_max_len = 0; - rcb->bge_nicaddr = 0; - rcb++; + vrcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); + vrcb->bge_nicaddr = 0; + vrcb++; } /* Configure TX RCB 0 (we use only the first ring) */ - rcb = (struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + + vrcb = (volatile struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + BGE_SEND_RING_RCB); - rcb->bge_hostaddr.bge_addr_hi = 0; - BGE_HOSTADDR(rcb->bge_hostaddr) = + vrcb->bge_hostaddr.bge_addr_hi = 0; + BGE_HOSTADDR(vrcb->bge_hostaddr) = vtophys(&sc->bge_rdata->bge_tx_ring); - rcb->bge_nicaddr = BGE_NIC_TXRING_ADDR(0, BGE_TX_RING_CNT); - rcb->bge_max_len = BGE_TX_RING_CNT; - rcb->bge_flags = 0; + vrcb->bge_nicaddr = BGE_NIC_TXRING_ADDR(0, BGE_TX_RING_CNT); + vrcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_TX_RING_CNT, 0); /* Disable all unused RX return rings */ - rcb = (struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + + vrcb = (volatile struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + BGE_RX_RETURN_RING_RCB); for (i = 0; i < BGE_RX_RINGS_MAX; i++) { - rcb->bge_hostaddr.bge_addr_hi = 0; - rcb->bge_hostaddr.bge_addr_lo = 0; - rcb->bge_flags = BGE_RCB_FLAG_RING_DISABLED; - rcb->bge_max_len = BGE_RETURN_RING_CNT; - rcb->bge_nicaddr = 0; + vrcb->bge_hostaddr.bge_addr_hi = 0; + vrcb->bge_hostaddr.bge_addr_lo = 0; + vrcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(BGE_RETURN_RING_CNT, + BGE_RCB_FLAG_RING_DISABLED); + vrcb->bge_nicaddr = 0; CSR_WRITE_4(sc, BGE_MBX_RX_CONS0_LO + (i * (sizeof(u_int64_t))), 0); - rcb++; + vrcb++; } /* Initialize RX ring indexes */ @@ -1235,14 +1232,13 @@ * The return rings live entirely within the host, so the * nicaddr field in the RCB isn't used. */ - rcb = (struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + + vrcb = (volatile struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + BGE_RX_RETURN_RING_RCB); - rcb->bge_hostaddr.bge_addr_hi = 0; - BGE_HOSTADDR(rcb->bge_hostaddr) = + vrcb->bge_hostaddr.bge_addr_hi = 0; + BGE_HOSTADDR(vrcb->bge_hostaddr) = vtophys(&sc->bge_rdata->bge_rx_return_ring); - rcb->bge_nicaddr = 0x00000000; - rcb->bge_max_len = BGE_RETURN_RING_CNT; - rcb->bge_flags = 0; + vrcb->bge_nicaddr = 0x00000000; + vrcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_RETURN_RING_CNT, 0); /* Set random backoff seed for TX */ CSR_WRITE_4(sc, BGE_TX_RANDOM_BACKOFF, @@ -1422,6 +1418,7 @@ { struct bge_type *t; struct bge_softc *sc; + char *descbuf; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jan 7 17:56:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C621C37B405; Tue, 7 Jan 2003 17:56:23 -0800 (PST) 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 5D77437B401 for ; Tue, 7 Jan 2003 17:56:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92CDF43EA9 for ; Tue, 7 Jan 2003 17:56:22 -0800 (PST) (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 h081uMfh035984 for ; Tue, 7 Jan 2003 17:56:22 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h081uLwi035981 for perforce@freebsd.org; Tue, 7 Jan 2003 17:56:21 -0800 (PST) Date: Tue, 7 Jan 2003 17:56:21 -0800 (PST) Message-Id: <200301080156.h081uLwi035981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 23386 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23386 Change 23386 by jhb@jhb_laptop on 2003/01/07 17:55:36 IFC @23384. Affected files ... .. //depot/projects/smpng/sys/dev/em/LICENSE#1 branch .. //depot/projects/smpng/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#12 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#36 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#15 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#17 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#34 integrate .. //depot/projects/smpng/sys/posix4/p1003_1b.c#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#22 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#8 integrate Differences ... ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#13 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.109 2003/01/03 18:54:59 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.110 2003/01/08 01:23:16 jhb Exp $ */ #include "opt_cpu.h" @@ -604,6 +604,15 @@ "\037IA64" /* CPU can execute IA64 instructions */ "\040PBE" /* Pending Break Enable */ ); + + /* + * If this CPU supports hyperthreading then mention + * the number of logical CPU's it contains. + */ + if (cpu_feature & CPUID_HTT && + (cpuid_cpuinfo & CPUID_HTT_CORES) > 0x100) + printf("\n Hyperthreading: %d logical CPUs", + (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16); } if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && nreg >= 0x80000001) ==== //depot/projects/smpng/sys/i386/i386/initcpu.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/i386/i386/initcpu.c,v 1.38 2002/10/16 08:57:14 phk Exp $ + * $FreeBSD: src/sys/i386/i386/initcpu.c,v 1.39 2003/01/08 01:20:05 jhb Exp $ */ #include "opt_cpu.h" @@ -82,6 +82,7 @@ u_int cpu_id = 0; /* Stepping ID */ u_int cpu_feature = 0; /* Feature flags */ u_int cpu_high = 0; /* Highest arg to CPUID */ +u_int cpuid_cpuinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */ #ifdef CPU_ENABLE_SSE u_int cpu_fxsr = 0; /* SSE enabled */ #endif ==== //depot/projects/smpng/sys/i386/i386/locore.s#12 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.161 2002/12/02 19:58:55 deischen Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.162 2003/01/08 01:20:05 jhb Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -720,6 +720,7 @@ movl $1,%eax cpuid # cpuid 1 movl %eax,R(cpu_id) # store cpu_id + movl %ebx,R(cpuid_cpuinfo) # store cpuid_cpuinfo movl %edx,R(cpu_feature) # store cpu_feature rorl $8,%eax # extract family type andl $15,%eax ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#36 (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/i386/i386/mp_machdep.c,v 1.192 2002/10/16 08:57:14 phk Exp $ + * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.193 2003/01/08 01:33:18 jhb Exp $ */ #include "opt_cpu.h" @@ -237,6 +237,9 @@ #define MP_ANNOUNCE_POST 0x19 +static int need_hyperthreading_fixup; +static u_int logical_cpus; + /* used to hold the AP's until we are ready to release them */ static struct mtx ap_boot_mtx; @@ -312,6 +315,7 @@ static int search_for_sig(u_int32_t target, int count); static void mp_enable(u_int boot_addr); +static void mptable_hyperthread_fixup(u_int id_mask); static void mptable_pass1(void); static int mptable_pass2(void); static void default_mp_table(int type); @@ -782,6 +786,7 @@ void* position; int count; int type; + u_int id_mask; POSTCODE(MPTABLE_PASS1_POST); @@ -795,6 +800,7 @@ mp_nbusses = 0; mp_napics = 0; nintrs = 0; + id_mask = 0; /* check for use of 'default' configuration */ if (MPFPS_MPFB1 != 0) { @@ -829,6 +835,8 @@ & PROCENTRY_FLAG_EN) { ++mp_naps; mp_maxid++; + id_mask |= 1 << + ((proc_entry_ptr)position)->apic_id; } break; case 1: /* bus_entry */ @@ -863,6 +871,9 @@ mp_naps = MAXCPU; } + /* See if we need to fixup HT logical CPUs. */ + mptable_hyperthread_fixup(id_mask); + /* * Count the BSP. * This is also used as a counter while starting the APs. @@ -887,6 +898,7 @@ static int mptable_pass2(void) { + struct PROCENTRY proc; int x; mpcth_t cth; int totalSize; @@ -899,6 +911,11 @@ POSTCODE(MPTABLE_PASS2_POST); + /* Initialize fake proc entry for use with HT fixup. */ + bzero(&proc, sizeof(proc)); + proc.type = 0; + proc.cpu_flags = PROCENTRY_FLAG_EN; + pgeflag = 0; /* XXX - Not used under SMP yet. */ MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics, @@ -976,6 +993,20 @@ case 0: if (processor_entry(position, cpu)) ++cpu; + + if (need_hyperthreading_fixup) { + /* + * Create fake mptable processor entries + * and feed them to processor_entry() to + * enumerate the logical CPUs. + */ + proc.apic_id = ((proc_entry_ptr)position)->apic_id; + for (i = 1; i < logical_cpus; i++) { + proc.apic_id++; + (void)processor_entry(&proc, cpu); + cpu++; + } + } break; case 1: if (bus_entry(position, bus)) @@ -1008,6 +1039,55 @@ return 0; } +/* + * Check if we should perform a hyperthreading "fix-up" to + * enumerate any logical CPU's that aren't already listed + * in the table. + * + * XXX: We assume that all of the physical CPUs in the + * system have the same number of logical CPUs. + * + * XXX: We assume that APIC ID's are allocated such that + * the APIC ID's for a physical processor are aligned + * with the number of logical CPU's in the processor. + */ +static void +mptable_hyperthread_fixup(u_int id_mask) +{ + u_int i, id; + + /* Nothing to do if there is no HTT support. */ + if ((cpu_feature & CPUID_HTT) == 0) + return; + logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16; + if (logical_cpus <= 1) + return; + + /* + * For each APIC ID of a CPU that is set in the mask, + * scan the other candidate APIC ID's for this + * physical processor. If any of those ID's are + * already in the table, then kill the fixup. + */ + for (id = 0; id <= MAXCPU; id++) { + if ((id_mask & 1 << id) == 0) + continue; + /* First, make sure we are on a logical_cpus boundary. */ + if (id % logical_cpus != 0) + return; + for (i = id + 1; i < id + logical_cpus; i++) + if ((id_mask & 1 << i) != 0) + return; + } + + /* + * Ok, the ID's checked out, so enable the fixup. We have to fixup + * mp_naps and mp_maxid right now. + */ + need_hyperthreading_fixup = 1; + mp_maxid *= logical_cpus; + mp_naps *= logical_cpus; +} void assign_apic_irq(int apic, int intpin, int irq) ==== //depot/projects/smpng/sys/i386/include/md_var.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/md_var.h,v 1.54 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/md_var.h,v 1.55 2003/01/08 01:20:05 jhb Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -44,6 +44,7 @@ extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); extern u_int cpu_feature; extern u_int cpu_high; +extern u_int cpuid_cpuinfo; extern u_int cpu_id; extern u_int cpu_fxsr; extern char cpu_vendor[]; ==== //depot/projects/smpng/sys/i386/include/specialreg.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.21 2002/06/22 23:00:33 mp Exp $ + * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.22 2003/01/08 01:15:26 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -106,12 +106,20 @@ #define CPUID_XMM 0x02000000 #define CPUID_SSE2 0x04000000 #define CPUID_SS 0x08000000 -#define CPUID_HHT 0x10000000 +#define CPUID_HTT 0x10000000 #define CPUID_TM 0x20000000 #define CPUID_B30 0x40000000 #define CPUID_PBE 0x80000000 /* + *CPUID instruction 1 ebx info + */ +#define CPUID_BRAND_INDEX 0x000000ff +#define CPUID_CLFUSH_SIZE 0x0000ff00 +#define CPUID_HTT_CORES 0x00ff0000 +#define CPUID_LOCAL_APIC_ID 0xff000000 + +/* * Model-specific registers for the i386 family */ #define MSR_P5_MC_ADDR 0x000 ==== //depot/projects/smpng/sys/kern/kern_module.c#10 (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_module.c,v 1.38 2002/12/14 01:56:25 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_module.c,v 1.39 2003/01/07 22:24:13 peter Exp $ */ #include @@ -74,7 +74,7 @@ sx_init(&modules_sx, "module subsystem sx lock"); TAILQ_INIT(&modules); - EVENTHANDLER_REGISTER(shutdown_post_sync, module_shutdown, NULL, + EVENTHANDLER_REGISTER(shutdown_final, module_shutdown, NULL, SHUTDOWN_PRI_DEFAULT); } ==== //depot/projects/smpng/sys/kern/subr_prf.c#24 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/subr_prf.c,v 1.93 2003/01/04 20:15:32 phk Exp $ + * $FreeBSD: src/sys/kern/subr_prf.c,v 1.94 2003/01/07 18:17:18 jhb Exp $ */ #include "opt_ddb.h" @@ -560,7 +560,7 @@ width = n; goto reswitch; case 'b': - num = va_arg(ap, int); + num = (u_int)va_arg(ap, int); p = va_arg(ap, char *); for (q = ksprintn(nbuf, num, *p++, NULL); *q;) PCHAR(*q--); ==== //depot/projects/smpng/sys/kern/subr_prof.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/subr_prof.c,v 1.56 2003/01/06 07:40:49 phk Exp $ + * $FreeBSD: src/sys/kern/subr_prof.c,v 1.57 2003/01/07 19:09:10 phk Exp $ */ #include @@ -157,7 +157,6 @@ uintfptr_t tmp_addr; #endif - tcov_init(); /* * Round lowpc and highpc to multiples of the density we're using * so the rest of the scaling (here and in gprof) stays in ints. @@ -563,7 +562,7 @@ } } -SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_SECOND, tcov_init, NULL) +SYSINIT(tcov_init, SI_SUB_KPROF, SI_ORDER_SECOND, tcov_init, NULL) /* * GCC contains magic to recognize calls to for instance execve() and ==== //depot/projects/smpng/sys/kern/vfs_bio.c#34 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.351 2003/01/05 22:01:08 phk Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.352 2003/01/07 19:55:08 alc Exp $ */ /* @@ -167,12 +167,6 @@ vm_page_t bogus_page; /* - * Offset for bogus_page. - * XXX bogus_offset should be local to bufinit - */ -static vm_offset_t bogus_offset; - -/* * Synchronization (sleep/wakeup) variable for active buffer space requests. * Set when wait starts, cleared prior to wakeup(). * Used in runningbufwakeup() and waitrunningbufspace(). @@ -486,6 +480,7 @@ bufinit(void) { struct buf *bp; + vm_offset_t bogus_offset; int i; GIANT_REQUIRED; ==== //depot/projects/smpng/sys/kern/vfs_vnops.c#34 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.178 2002/12/28 20:28:10 dillon Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.179 2003/01/07 20:59:55 green Exp $ */ #include "opt_mac.h" @@ -271,6 +271,7 @@ NDFREE(ndp, NDF_ONLY_PNBUF); vput(vp); *flagp = fmode; + ndp->ni_vp = NULL; return (error); } ==== //depot/projects/smpng/sys/posix4/p1003_1b.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/posix4/p1003_1b.c,v 1.20 2002/11/15 22:55:06 alfred Exp $ + * $FreeBSD: src/sys/posix4/p1003_1b.c,v 1.21 2003/01/07 20:10:04 alfred Exp $ */ /* p1003_1b: Real Time common code. @@ -306,6 +306,7 @@ { int e; struct thread *targettd; + struct timespec timespec; struct proc *targetp; mtx_lock(&Giant); @@ -326,7 +327,10 @@ PROC_UNLOCK(targetp); if (e == 0) { e = ksched_rr_get_interval(&td->td_retval[0], ksched, targettd, - uap->interval); + ×pec); + if (e == 0) + e = copyout(×pec, uap->interval, + sizeof(timespec)); } done2: mtx_unlock(&Giant); ==== //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.131 2003/01/01 18:48:59 schweikh Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.132 2003/01/07 18:23:50 mckusick Exp $"); /* * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide. @@ -499,6 +499,7 @@ static int softdep_worklist_busy; /* 1 => trying to do unmount */ static int softdep_worklist_req; /* serialized waiters */ static int max_softdeps; /* maximum number of structs before slowdown */ +static int maxindirdeps = 50; /* max number of indirdeps before slowdown */ static int tickdelay = 2; /* number of ticks to pause during slowdown */ static int proc_waiting; /* tracks whether we have a timeout posted */ static int *stat_countp; /* statistic to count in proc_waiting timeout */ @@ -527,6 +528,7 @@ #include SYSCTL_INT(_debug, OID_AUTO, max_softdeps, CTLFLAG_RW, &max_softdeps, 0, ""); SYSCTL_INT(_debug, OID_AUTO, tickdelay, CTLFLAG_RW, &tickdelay, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, maxindirdeps, CTLFLAG_RW, &maxindirdeps, 0, ""); SYSCTL_INT(_debug, OID_AUTO, worklist_push, CTLFLAG_RW, &stat_worklist_push, 0,""); SYSCTL_INT(_debug, OID_AUTO, blk_limit_push, CTLFLAG_RW, &stat_blk_limit_push, 0,""); SYSCTL_INT(_debug, OID_AUTO, ino_limit_push, CTLFLAG_RW, &stat_ino_limit_push, 0,""); @@ -1862,8 +1864,7 @@ handle_workitem_freefrag(freefrag); } if (newindirdep) { - if (indirdep->ir_savebp != NULL) - brelse(newindirdep->ir_savebp); + brelse(newindirdep->ir_savebp); WORKITEM_FREE((caddr_t)newindirdep, D_INDIRDEP); } if (indirdep) @@ -2125,6 +2126,7 @@ panic("deallocate_dependencies: already gone"); } indirdep->ir_state |= GOINGAWAY; + VFSTOUFS(bp->b_vp->v_mount)->um_numindirdeps += 1; while ((aip = LIST_FIRST(&indirdep->ir_deplisthd)) != 0) free_allocindir(aip, inodedep); if (bp->b_lblkno >= 0 || @@ -2564,6 +2566,7 @@ FREE_LOCK(&lk); panic("indir_trunc: dangling dep"); } + VFSTOUFS(freeblks->fb_mnt)->um_numindirdeps -= 1; FREE_LOCK(&lk); } else { FREE_LOCK(&lk); @@ -3454,7 +3457,8 @@ * dependency can be freed. */ if (LIST_FIRST(&indirdep->ir_deplisthd) == NULL) { - indirdep->ir_savebp->b_flags |= B_INVAL | B_NOCACHE; + indirdep->ir_savebp->b_flags |= + B_INVAL | B_NOCACHE; brelse(indirdep->ir_savebp); /* inline expand WORKLIST_REMOVE(wk); */ wk->wk_state &= ~ONWORKLIST; @@ -5410,8 +5414,11 @@ max_softdeps_hard = max_softdeps * 11 / 10; if (num_dirrem < max_softdeps_hard / 2 && - num_inodedep < max_softdeps_hard) - return (0); + num_inodedep < max_softdeps_hard && + VFSTOUFS(vp->v_mount)->um_numindirdeps < maxindirdeps) + return (0); + if (VFSTOUFS(vp->v_mount)->um_numindirdeps >= maxindirdeps) + speedup_syncer(); stat_sync_limit_hit += 1; return (1); } ==== //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.27 2002/12/27 10:06:37 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.28 2003/01/07 18:23:50 mckusick Exp $ */ #ifndef _UFS_UFS_UFSMOUNT_H_ @@ -73,6 +73,7 @@ u_long um_nindir; /* indirect ptrs per block */ u_long um_bptrtodb; /* indir ptr to disk block */ u_long um_seqinc; /* inc between seq blocks */ + long um_numindirdeps; /* indirdeps for this filesys */ time_t um_btime[MAXQUOTAS]; /* block quota time limit */ time_t um_itime[MAXQUOTAS]; /* inode quota time limit */ char um_qflags[MAXQUOTAS]; /* quota specific flags */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 4:41:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C55C137B405; Wed, 8 Jan 2003 04:41:44 -0800 (PST) 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 5C2A737B401 for ; Wed, 8 Jan 2003 04:41:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9FD943EA9 for ; Wed, 8 Jan 2003 04:41:42 -0800 (PST) (envelope-from chris@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 h08Cfgfh070103 for ; Wed, 8 Jan 2003 04:41:42 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08Cfg4P070100 for perforce@freebsd.org; Wed, 8 Jan 2003 04:41:42 -0800 (PST) Date: Wed, 8 Jan 2003 04:41:42 -0800 (PST) Message-Id: <200301081241.h08Cfg4P070100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 23407 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23407 Change 23407 by chris@chris_holly on 2003/01/08 04:41:01 Add check_kld_{load,unload,stat} and check_kenv_{set,get,unset,dump} Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#19 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#19 (text+ko) ==== @@ -2791,6 +2791,251 @@ failure: EACCES for label mismatches, EPERM for lack of privilege. + + + <function>&mac.mpo;_check_kenv_dump</function> + + + + int + &mac.mpo;_check_kenv_dump + + struct ucred + *cred + + + + + + &mac.thead; + + + + cred + Subject credential + + + + + + Determine whether the subject should be allowed to + retrieve the kernel environment (see &man.kenv.2;). + + + + <function>&mac.mpo;_check_kenv_get</function> + + + + int + &mac.mpo;_check_kenv_get + + struct ucred + *cred + char *name + + + + + + &mac.thead; + + + + cred + Subject credential + + + + name + Kernel environment variable name + + + + + + Determine whether the subject should be allowed to + retrieve the value of the specified kernel environment + variable. + + + + <function>&mac.mpo;_check_kenv_set</function> + + + + int + &mac.mpo;_check_kenv_set + + struct ucred + *cred + char *name + + + + + + &mac.thead; + + + + cred + Subject credential + + + + name + Kernel environment variable name + + + + + + Determine whether the subject should be allowed to set + the specified kernel environment variable. + + + + <function>&mac.mpo;_check_kenv_unset</function> + + + + int + &mac.mpo;_check_kenv_unset + + struct ucred + *cred + char *name + + + + + + &mac.thead; + + + + cred + Subject credential + + + + name + Kernel environment variable name + + + + + + Determine whether the subject should be allowed to unset + the specified kernel environment variable. + + + + <function>&mac.mpo;_check_kld_load</function> + + + + int + &mac.mpo;_check_kld_load + + struct ucred + *cred + struct vnode + *vp + struct label + *vlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + vp + Kernel module vnode + + + + vlabel + Label associated with + vp + + + + + + Determine whether the subject should be allowed to load + the specified module file. + + + + <function>&mac.mpo;_check_kld_stat</function> + + + + int + &mac.mpo;_check_kld_stat + + struct ucred + *cred + + + + + + &mac.thead; + + + + cred + Subject credential + + + + + + Determine whether the subject should be allowed to + retrieve a list of loaded kernel module files and associated + statistics. + + + + <function>&mac.mpo;_check_kld_unload</function> + + + + int + &mac.mpo;_check_kld_unload + + struct ucred + *cred + + + + + + &mac.thead; + + + + cred + Subject credential + + + + + + Determine whether the subject should be allowed to + unload a kernel module. + <function>&mac.mpo;_check_socket_bind</function> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 9:10:25 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9BD337B405; Wed, 8 Jan 2003 09:09:54 -0800 (PST) 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 6E19437B401 for ; Wed, 8 Jan 2003 09:09:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5D7943EE1 for ; Wed, 8 Jan 2003 09:09:52 -0800 (PST) (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 h08H9qfh063620 for ; Wed, 8 Jan 2003 09:09:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08H9pQ0063617 for perforce@freebsd.org; Wed, 8 Jan 2003 09:09:51 -0800 (PST) Date: Wed, 8 Jan 2003 09:09:51 -0800 (PST) Message-Id: <200301081709.h08H9pQ0063617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23422 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23422 Change 23422 by peter@peter_daintree on 2003/01/08 09:09:30 IFC @23421 Affected files ... .. //depot/projects/ia64/bin/sh/expand.c#8 integrate .. //depot/projects/ia64/contrib/com_err/getarg.c#3 integrate .. //depot/projects/ia64/contrib/diff/prepend_args.c#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#4 integrate .. //depot/projects/ia64/contrib/openpam/CREDITS#6 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#13 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#9 integrate .. //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#10 integrate .. //depot/projects/ia64/contrib/tcp_wrappers/inetcf.c#3 integrate .. //depot/projects/ia64/include/pthread_np.h#5 integrate .. //depot/projects/ia64/include/ulimit.h#3 integrate .. //depot/projects/ia64/lib/libc/gen/stringlist.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.c#4 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#7 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/ia64/lib/libc/stdio/stdio.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vswprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/madvise.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/pathconf.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/setuid.2#4 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_attr_get_np.c#2 integrate .. //depot/projects/ia64/lib/libugidfw/Makefile#3 integrate .. //depot/projects/ia64/lib/libugidfw/bsde_get_rule.3#1 branch .. //depot/projects/ia64/lib/libugidfw/bsde_get_rule_count.3#1 branch .. //depot/projects/ia64/lib/libugidfw/bsde_parse_rule.3#1 branch .. //depot/projects/ia64/lib/libugidfw/bsde_rule_to_string.3#1 branch .. //depot/projects/ia64/lib/libugidfw/libugidfw.3#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#34 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#13 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#4 integrate .. //depot/projects/ia64/sbin/slattach/slattach.c#5 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#2 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#32 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_mls.4#6 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_partition.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_one2many.4#2 integrate .. //depot/projects/ia64/share/man/man5/Makefile#10 integrate .. //depot/projects/ia64/share/man/man5/elf.5#2 integrate .. //depot/projects/ia64/share/man/man9/mac.9#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#27 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#19 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#19 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#1 branch .. //depot/projects/ia64/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/ia64/sys/dev/hme/if_hmereg.h#4 integrate .. //depot/projects/ia64/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#6 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#7 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecvar.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#7 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#10 integrate .. //depot/projects/ia64/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#40 integrate .. //depot/projects/ia64/sys/kern/kern_module.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#18 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#7 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/ia64/sys/net/if_loop.c#11 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#8 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#8 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#18 integrate .. //depot/projects/ia64/sys/posix4/p1003_1b.c#5 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/interrupt.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#20 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#14 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#9 integrate .. //depot/projects/ia64/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/ia64/sys/sparc64/include/iommureg.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/iommuvar.h#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#7 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychoreg.h#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#8 integrate .. //depot/projects/ia64/sys/sys/copyright.h#4 integrate .. //depot/projects/ia64/sys/sys/syscall.h#23 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#23 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#25 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#21 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufsmount.h#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/Makefile.inc#6 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/crypto/cryptokeytest.c#1 branch .. //depot/projects/ia64/tools/tools/crypto/cryptostats.c#1 branch .. //depot/projects/ia64/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#9 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#22 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/misc.c#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#14 integrate Differences ... ==== //depot/projects/ia64/bin/sh/expand.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.40 2002/12/26 14:28:54 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.41 2003/01/08 10:50:08 tjr Exp $"); #include #include @@ -278,7 +278,7 @@ char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); while ((c = *p) != '\0') { switch(c) { @@ -369,7 +369,7 @@ char *p, *start; int result; int begoff; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); int quoted; @@ -436,7 +436,7 @@ int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int saveherefd; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); INTOFF; saveifs = ifsfirst; @@ -635,7 +635,7 @@ int startloc; int varlen; int easy; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); varflags = *p++; subtype = varflags & VSTYPE; ==== //depot/projects/ia64/contrib/com_err/getarg.c#3 (text+ko) ==== @@ -34,6 +34,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/contrib/com_err/getarg.c,v 1.2 2003/01/08 17:05:52 peter Exp $ */ #if 0 ==== //depot/projects/ia64/contrib/diff/prepend_args.c#3 (text+ko) ==== @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/diff/prepend_args.c,v 1.1 1999/11/26 02:51:44 obrien Exp $ */ +/* $FreeBSD: src/contrib/diff/prepend_args.c,v 1.2 2003/01/08 06:40:35 peter Exp $ */ #ifdef HAVE_CONFIG_H ==== //depot/projects/ia64/contrib/groff/tmac/doc-syms#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)doc-syms 8.1 (Berkeley) 06/08/93 -.\" $FreeBSD: src/contrib/groff/tmac/doc-syms,v 1.41 2001/12/24 08:59:48 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/doc-syms,v 1.42 2003/01/07 11:30:53 chris Exp $ .\" .\" %beginstrip% . @@ -688,6 +688,7 @@ .ds doc-str-Lb-libposix \*[Px] Compatibility Library (libposix, \-lposix) .ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) +.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libz Compression Library (libz, \-lz) . ==== //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#4 (text+ko) ==== @@ -112,6 +112,7 @@ __RCSID("$NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $"); #endif #endif /* not lint */ +__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.2 2003/01/07 17:31:23 obrien Exp $"); /* * FTP server. @@ -227,6 +228,21 @@ SS_DATA_ERROR /* data send error */ }; + +#ifdef USE_OPIE +#include +static struct opie opiedata; +static char opieprompt[OPIE_CHALLENGE_MAX+1]; +static int pwok; +#endif + +#ifdef USE_PAM +#include +pam_handle_t *pamh = NULL; +#include "pamize.h" +#endif + + static int bind_pasv_addr(void); static int checkuser(const char *, const char *, int, int, char **); static int checkaccess(const char *); @@ -745,6 +761,18 @@ curname); } else #endif + +#ifdef USE_OPIE + if (opiechallenge(&opiedata, (char *)curname, opieprompt) == + 0) { + pwok = (pw != NULL) && + opieaccessfile(remotehost) && + opiealways(pw->pw_dir); + reply(331, "Response to %s %s for %s.", + opieprompt, pwok ? "requested" : "required", + curname); + } else +#endif reply(331, "Password required for %s.", curname); } @@ -987,6 +1015,9 @@ static void end_login(void) { +#ifdef USE_PAM + int e; +#endif logout_utmp(); show_chdir_messages(-1); /* flush chdir cache */ if (pw != NULL && pw->pw_passwd != NULL) @@ -999,11 +1030,23 @@ gidcount = 0; curclass.type = CLASS_REAL; (void) seteuid((uid_t)0); +#ifdef USE_PAM + if ((e = pam_setcred(pamh, PAM_DELETE_CRED)) != PAM_SUCCESS) + syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, e)); + if ((e = pam_close_session(pamh,0)) != PAM_SUCCESS) + syslog(LOG_ERR, "pam_close_session: %s", pam_strerror(pamh, e)); + if ((e = pam_end(pamh, e)) != PAM_SUCCESS) + syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e)); + pamh = NULL; +#endif } void pass(const char *passwd) { +#ifdef USE_PAM + int e; +#endif int rval; char root[MAXPATHLEN]; @@ -1044,6 +1087,27 @@ } } #endif + +#ifdef USE_PAM + rval = auth_pam(&pw, passwd); + if (rval >= 0) { +#ifdef USE_OPIE + opieunlock(); +#endif + goto skip; + } +#endif +#ifdef USE_OPIE + if (opieverify(&opiedata, (char *)passwd) == 0) { + /* OPIE says ok, check expire time */ + if (pw->pw_expire && time(NULL) >= pw->pw_expire) + rval = 2; + else + rval = 0; + goto skip; + } +#endif + if (!sflag) rval = checkpassword(pw, passwd); else @@ -1095,6 +1159,19 @@ /* cache groups for cmds.c::matchgroup() */ gidcount = getgroups(sizeof(gidlist), gidlist); +#ifdef USE_PAM + if (pamh) { + if ((e = pam_open_session(pamh, 0)) != PAM_SUCCESS) { + syslog(LOG_ERR, "pam_open_session: %s", + pam_strerror(pamh, e)); + } else if ((e = pam_setcred(pamh, PAM_ESTABLISH_CRED)) != + PAM_SUCCESS) { + syslog(LOG_ERR, "pam_setcred: %s", + pam_strerror(pamh, e)); + } + } +#endif + /* open utmp/wtmp before chroot */ login_utmp(ttyline, pw->pw_name, remotehost); ==== //depot/projects/ia64/contrib/openpam/CREDITS#6 (text) ==== @@ -17,10 +17,12 @@ Eric Melville Gary Winiger Joe Marcus Clarke + Juli Mallett Mark Murray + Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#4 $ +$P4: //depot/projects/openpam/CREDITS#6 $ ==== //depot/projects/ia64/contrib/openpam/HISTORY#13 (text) ==== @@ -1,3 +1,11 @@ +OpenPAM Daffodil 2003-01-06 + + - ENHANCE: Document dependency on (for size_t) + + - ENHANCE: Slightly improve error detection in openpam_ttyconv(). + + - BUGFIX: Fix several typos in debugging macros. +============================================================================ OpenPAM Cyclamen 2002-12-12 - ENHANCE: Improve recursion detection in openpam_dispatch(). @@ -198,4 +206,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#16 $ +$P4: //depot/projects/openpam/HISTORY#17 $ ==== //depot/projects/ia64/contrib/openpam/RELNOTES#13 (text) ==== @@ -1,7 +1,11 @@ - Release notes for OpenPAM Cyclamen + Release notes for OpenPAM Daffodil ================================== +This is a bugfix release. The previous release, Cyclamen, was rushed +out without sufficient testing, and contained a number of small but +serious errors. + This release corresponds to the code used in FreeBSD-CURRENT as of the release date. It has also been successfully built on NetBSD 1.6, and should build with minimal or no changes on OpenBSD. Work is underway @@ -23,4 +27,4 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#13 $ +$P4: //depot/projects/openpam/RELNOTES#14 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#9 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft int ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#9 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft void ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft const char * ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft void ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#4 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft int ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#9 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft int ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft int ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft int ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_chauthtok "pam_handle_t *pamh" "int flags" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_close_session "pam_handle_t *pamh" "int flags" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_END 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_end "pam_handle_t *pamh" "int status" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_ERROR 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..." ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#14 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GET_DATA 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "const void **data" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GET_ITEM 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GET_USER 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GETENV 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#14 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_GETENVLIST 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft char ** .Fn pam_getenvlist "pam_handle_t *pamh" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_INFO 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_info "pam_handle_t *pamh" "const char *fmt" "..." ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_open_session "pam_handle_t *pamh" "int flags" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_PROMPT 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_prompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..." ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_PUTENV 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY .Lb libpam .Sh SYNOPSIS +.In sys/types.h .In security/pam_appl.h .Ft int .Fn pam_putenv "pam_handle_t *pamh" "const char *namevalue" ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd December 12, 2002 +.Dd January 6, 2003 .Dt PAM_SET_DATA 3 .Os .Sh NAME @@ -42,6 +42,7 @@ .Sh LIBRARY >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 10:31:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11EB737B405; Wed, 8 Jan 2003 10:31:00 -0800 (PST) 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 7FD0E37B401 for ; Wed, 8 Jan 2003 10:30:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0337443ED1 for ; Wed, 8 Jan 2003 10:30:59 -0800 (PST) (envelope-from green@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 h08IUwfh094650 for ; Wed, 8 Jan 2003 10:30:58 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08IUw48094633 for perforce@freebsd.org; Wed, 8 Jan 2003 10:30:58 -0800 (PST) Date: Wed, 8 Jan 2003 10:30:58 -0800 (PST) Message-Id: <200301081830.h08IUw48094633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23429 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23429 Change 23429 by green@green_laptop_2 on 2003/01/08 10:30:06 * Correct a bunch of error returns in SEBSD to not be -errno. * Use the fslabel in the mountpoints so that SEBSD can handle single-label generic filesystems. * Add an entry to put all of procfs under the proc_t type. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#7 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#12 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#65 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_labels.h#3 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#3 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#8 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#5 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#7 (text+ko) ==== @@ -24,6 +24,9 @@ genfscon proc /kmsg system_u:object_r:proc_kmsg_t genfscon proc /kcore system_u:object_r:proc_kcore_t +# procfs (FreeBSD) +genfscon procfs / system_u:object_r:proc_t + # nfs genfscon nfs / system_u:object_r:nfs_t ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#14 (text+ko) ==== @@ -405,7 +405,7 @@ * based on `tclass'. If a valid AVC entry exists, * then this function updates `aeref' to refer to the * entry and returns 0. Otherwise, this function - * returns -ENOENT. + * returns ENOENT. */ int avc_lookup( security_id_t ssid, /* IN */ @@ -428,7 +428,7 @@ } avc_cache_stats_incr(AVC_CAV_MISSES); - return -ENOENT; + return ENOENT; } @@ -442,7 +442,7 @@ * revocation notification, then the function copies * the access vectors into a cache entry, updates * `aeref' to refer to the entry, and returns 0. - * Otherwise, this function returns -EAGAIN. + * Otherwise, this function returns EAGAIN. */ int avc_insert(security_id_t ssid, /* IN */ security_id_t tsid, /* IN */ @@ -456,12 +456,12 @@ if (seqno < avc_cache.latest_notif) { printf("avc: seqno %d < latest_notif %d\n", seqno, avc_cache.latest_notif); - return -EAGAIN; + return EAGAIN; } node = avc_claim_node(ssid, tsid, tclass); if (!node) { - return -ENOMEM; + return ENOMEM; } node->ae.allowed = ae->allowed; @@ -555,7 +555,7 @@ M_SEBSD_AVC, M_WAITOK); if (!c) - return -ENOMEM; + return ENOMEM; c->callback = callback; c->events = events; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#12 (text+ko) ==== @@ -295,7 +295,7 @@ return 0; } else { mtx_unlock(&avc_lock); - return -EACCES; + return EACCES; } } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#65 (text+ko) ==== @@ -272,7 +272,6 @@ struct mount_security_struct *sbsec; sbsec = malloc(sizeof(*sbsec), M_SEBSD, M_ZERO | M_WAITOK); - memset(sbsec, 0, sizeof(struct mount_security_struct)); sbsec->sid = SECINITSID_UNLABELED; SLOT(label) = sbsec; } @@ -280,9 +279,11 @@ static void sebsd_init_mount_fs_label(struct label *label) { + struct mount_fs_security_struct *sbsec; - /* TBD: Currently Unecessary */ - SLOT(label) = NULL; + sbsec = malloc(sizeof(*sbsec), M_SEBSD, M_ZERO | M_WAITOK); + sbsec->sid = SECINITSID_UNLABELED; + SLOT(label) = sbsec; } static void @@ -394,8 +395,13 @@ sebsd_associate_vnode_singlelabel(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel) { + struct mount_fs_security_struct *sbsec; + struct vnode_security_struct *vsec; - /* TBD, default to SECINITSID_UNLABELED. */ + sbsec = SLOT(fslabel); + vsec = SLOT(vlabel); + vsec->sid = sbsec->sid; + vsec->sclass = vnode_type_to_security_class(vp->v_type); } static void @@ -566,16 +572,23 @@ struct label *mntlabel, struct label *fslabel) { struct mount_security_struct *sbsec; + struct mount_fs_security_struct *sbfssec; int behavior, rc; sbsec = SLOT(mntlabel); + sbfssec = SLOT(fslabel); /* TBD TBD TBD */ + /* + * Make the label for the filesystem the same as the singlelabel + * which the filesystem will use if not a "multilabel" type. + */ rc = security_fs_use(mp->mnt_vfc->vfc_name, &behavior, &sbsec->sid); if (rc) { printf("sebsd_create_mount: security_fs_use(%s) returned %d\n", mp->mnt_vfc->vfc_name, rc); behavior = SECURITY_FS_USE_NONE; } else { + sbfssec->sid = sbsec->sid; /* TBD: debugging only */ printf("sebsd_create_mount: security_fs_use(%s) behavior %d, sid %d\n", mp->mnt_vfc->vfc_name, behavior, sbsec->sid); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_labels.h#3 (text+ko) ==== @@ -57,12 +57,20 @@ struct mount_security_struct { security_id_t sid; /* SID of file system */ +#ifndef __FreeBSD__ struct psidtab *psidtab; /* persistent SID mapping */ +#endif unsigned char uses_psids; /* uses persistent SID flag */ +#ifndef __FreeBSD__ unsigned char initialized; /* initialization flag */ +#endif unsigned char uses_task; /* use creating task SID for inodes */ unsigned char uses_genfs; /* use security_genfs_sid for inodes */ unsigned char proc; /* call procfs_set_sid */ unsigned char uses_trans; /* call security_transition_sid */ }; + +struct mount_fs_security_struct { + security_id_t sid; /* default object SID of file system */ +}; #endif /* _SYS_SECURITY_SEBSD_LABELS_H */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ avtab_ptr_t prev, cur, newnode; if (!h) - return -ENOMEM; + return ENOMEM; hvalue = AVTAB_HASH(key); for (prev = NULL, cur = h->htable[hvalue]; @@ -47,7 +47,7 @@ key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && (datum->specified & cur->datum.specified)) - return -EEXIST; + return EEXIST; if (key->source_type < cur->key.source_type) break; if (key->source_type == cur->key.source_type && @@ -62,7 +62,7 @@ newnode = (avtab_ptr_t)sebsd_malloc(sizeof(struct avtab_node), M_SEBSD_SS, M_WAITOK | M_ZERO); if (newnode == NULL) - return -ENOMEM; + return ENOMEM; /* memset(newnode, 0, sizeof(struct avtab_node)); */ newnode->key = *key; newnode->datum = *datum; @@ -284,9 +284,9 @@ } rc = avtab_insert(a, &avkey, &avdatum); if (rc) { - if (rc == -ENOMEM) + if (rc == ENOMEM) printf("security: avtab: out of memory\n"); - if (rc == -EEXIST) + if (rc == EEXIST) printf("security: avtab: duplicate entry\n"); goto bad; } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#3 (text+ko) ==== @@ -38,9 +38,9 @@ /* Define status codes for hash table functions */ #define HASHTAB_SUCCESS 0 -#define HASHTAB_OVERFLOW -ENOMEM -#define HASHTAB_PRESENT -EEXIST -#define HASHTAB_MISSING -ENOENT +#define HASHTAB_OVERFLOW ENOMEM +#define HASHTAB_PRESENT EEXIST +#define HASHTAB_MISSING ENOENT /* Creates a new hash table with the specified characteristics. ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#6 (text+ko) ==== @@ -37,14 +37,14 @@ fp = fopen(policyfile, "r"); if (!fp) { printf("security: unable to open %s, cannot initialize.\n", policyfile); - return -EINVAL; + return EINVAL; } rc = security_load_policy(fp); if (rc) { printf("security: error while loading %s, cannot initialize.\n", policyfile); fclose(fp); - return -EINVAL; + return EINVAL; } fclose(fp); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ sebsd_free(n, M_SEBSD_SS); return 0; } else { - return -EACCES; + return EACCES; } } @@ -44,14 +44,14 @@ sebsd_free(s, M_SEBSD_SS); return 0; } else { - return -EINVAL; + return EINVAL; } } /* TBD/CDV */ /* #else */ -/* #define compute_sid_handle_invalid_context(scontext,tcontext,tclass,newcontext) -EACCES */ -/* #define convert_context_handle_invalid_context(context) -EINVAL */ +/* #define compute_sid_handle_invalid_context(scontext,tcontext,tclass,newcontext) EACCES */ +/* #define convert_context_handle_invalid_context(context) EINVAL */ /* #endif */ #ifdef __FreeBSD__ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#8 (text+ko) ==== @@ -60,7 +60,7 @@ s->htable = sebsd_malloc(sizeof(sidtab_ptr_t)*SIDTAB_SIZE, M_SEBSD_SS, M_WAITOK); if (!s->htable) - return -ENOMEM; + return ENOMEM; for (i = 0; i < SIDTAB_SIZE; i++) s->htable[i] = (sidtab_ptr_t) NULL; s->nel = 0; @@ -76,7 +76,7 @@ if (!s) - return -ENOMEM; + return ENOMEM; hvalue = SIDTAB_HASH(sid); prev = NULL; @@ -87,16 +87,16 @@ } if (cur && sid == cur->sid) - return -EEXIST; + return EEXIST; newnode = (sidtab_node_t *) sebsd_malloc(sizeof(sidtab_node_t), M_SEBSD_SS, M_NOWAIT); if (newnode == NULL) - return -ENOMEM; + return ENOMEM; newnode->sid = sid; if (context_cpy(&newnode->context, context)) { sebsd_free(newnode, M_SEBSD_SS); - return -ENOMEM; + return ENOMEM; } if (prev) { @@ -123,7 +123,7 @@ if (!s) - return -ENOENT; + return ENOENT; hvalue = SIDTAB_HASH(sid); last = NULL; @@ -134,7 +134,7 @@ } if (cur == NULL || sid != cur->sid) - return -ENOENT; + return ENOENT; if (last == NULL) s->htable[hvalue] = cur->next; @@ -275,14 +275,14 @@ if (!sid) { ret = SIDTAB_TRYLOCK(s); if (ret == 0) - return -EAGAIN; + return EAGAIN; /* Rescan now that we hold the semaphore. */ sid = sidtab_search_context(s, context); if (sid) goto up_out; /* No SID exists for the context. Allocate a new one. */ if (s->next_sid == UINT_MAX) { - ret = -ENOMEM; + ret = ENOMEM; goto up_out; } sid = s->next_sid++; @@ -376,7 +376,7 @@ mysids = (security_id_t *)sebsd_malloc(mynel*sizeof(security_id_t), M_SEBSD_SS, M_NOWAIT); if (mysids == NULL) { - rc = -ENOMEM; + rc = ENOMEM; goto out; } j = 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 10:38:12 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0C8E37B405; Wed, 8 Jan 2003 10:38:09 -0800 (PST) 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 682DC37B401 for ; Wed, 8 Jan 2003 10:38:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE4243EE1 for ; Wed, 8 Jan 2003 10:38:09 -0800 (PST) (envelope-from green@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 h08Ic8fh096112 for ; Wed, 8 Jan 2003 10:38:08 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08Ic8U0096109 for perforce@freebsd.org; Wed, 8 Jan 2003 10:38:08 -0800 (PST) Date: Wed, 8 Jan 2003 10:38:08 -0800 (PST) Message-Id: <200301081838.h08Ic8U0096109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23431 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23431 Change 23431 by green@green_laptop_2 on 2003/01/08 10:37:59 The pseudofs-based filesystems do will need multilabel set before anything else can work; do what devfs does, which doesn't actually seem to work, though. Also, remove an unused VOP_REFRESHLABEL() implementation and such. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 edit .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,8 @@ #include #include +#include "opt_mac.h" + static MALLOC_DEFINE(M_PFSNODES, "pfs_nodes", "pseudofs nodes"); SYSCTL_NODE(_vfs, OID_AUTO, pfs, CTLFLAG_RW, 0, @@ -252,6 +255,9 @@ return (EOPNOTSUPP); mp->mnt_flag |= MNT_LOCAL; +#ifdef MAC + mp->mnt_flag |= MNT_MULTILABEL; +#endif mp->mnt_data = (qaddr_t)pi; vfs_getnewfsid(mp); ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 (text+ko) ==== @@ -821,9 +821,6 @@ { &vop_readdir_desc, (vop_t *)pfs_readdir }, { &vop_readlink_desc, (vop_t *)pfs_readlink }, { &vop_reclaim_desc, (vop_t *)pfs_reclaim }, -#ifdef MAC - { &vop_refreshlabel_desc, (vop_t *)pfs_refreshlabel }, -#endif { &vop_remove_desc, (vop_t *)vop_eopnotsupp }, { &vop_rename_desc, (vop_t *)vop_eopnotsupp }, { &vop_rmdir_desc, (vop_t *)vop_eopnotsupp }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 10:39:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8F9937B406; Wed, 8 Jan 2003 10:39:11 -0800 (PST) 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 6005F37B405 for ; Wed, 8 Jan 2003 10:39:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 192D843EB2 for ; Wed, 8 Jan 2003 10:39:11 -0800 (PST) (envelope-from green@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 h08IdAfh096130 for ; Wed, 8 Jan 2003 10:39:10 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08IdA5B096127 for perforce@freebsd.org; Wed, 8 Jan 2003 10:39:10 -0800 (PST) Date: Wed, 8 Jan 2003 10:39:10 -0800 (PST) Message-Id: <200301081839.h08IdA5B096127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23432 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23432 Change 23432 by green@green_laptop_2 on 2003/01/08 10:38:58 Use Hiten Pandya's fix for the sysctl bug where the kernel would crash if an empty leaf node was created. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#16 (text+ko) ==== @@ -557,7 +557,7 @@ if (!sysctl_sysctl_next_ls(lsp, 0, 0, next+1, len, level+1, oidpp)) return 0; - goto next; + goto emptynode; } if (oidp->oid_number < *name) @@ -586,6 +586,7 @@ return (0); next: namelen = 1; + emptynode: *len = level; } return 1; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 10:45:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17EAA37B406; Wed, 8 Jan 2003 10:45:22 -0800 (PST) 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 A1AF137B401; Wed, 8 Jan 2003 10:45:21 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFBB443EE6; Wed, 8 Jan 2003 10:45:20 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.6/8.12.5) with SMTP id h08IjJP4017782; Wed, 8 Jan 2003 13:45:19 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Wed, 8 Jan 2003 13:45:19 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23431 for review In-Reply-To: <200301081838.h08Ic8U0096109@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Not all synthetic pseudofs file systems might be multilabel; does the pseudofs model easily allow individual pseudofs file systems to set the mount flags? If so, that might be a preferred model. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Wed, 8 Jan 2003, Brian Feldman wrote: > http://perforce.freebsd.org/chv.cgi?CH=23431 > > Change 23431 by green@green_laptop_2 on 2003/01/08 10:37:59 > > The pseudofs-based filesystems do will need multilabel set > before anything else can work; do what devfs does, which doesn't > actually seem to work, though. Also, remove an unused > VOP_REFRESHLABEL() implementation and such. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 edit > .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#8 (text+ko) ==== > > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -44,6 +45,8 @@ > #include > #include > > +#include "opt_mac.h" > + > static MALLOC_DEFINE(M_PFSNODES, "pfs_nodes", "pseudofs nodes"); > > SYSCTL_NODE(_vfs, OID_AUTO, pfs, CTLFLAG_RW, 0, > @@ -252,6 +255,9 @@ > return (EOPNOTSUPP); > > mp->mnt_flag |= MNT_LOCAL; > +#ifdef MAC > + mp->mnt_flag |= MNT_MULTILABEL; > +#endif > mp->mnt_data = (qaddr_t)pi; > vfs_getnewfsid(mp); > > > ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#22 (text+ko) ==== > > @@ -821,9 +821,6 @@ > { &vop_readdir_desc, (vop_t *)pfs_readdir }, > { &vop_readlink_desc, (vop_t *)pfs_readlink }, > { &vop_reclaim_desc, (vop_t *)pfs_reclaim }, > -#ifdef MAC > - { &vop_refreshlabel_desc, (vop_t *)pfs_refreshlabel }, > -#endif > { &vop_remove_desc, (vop_t *)vop_eopnotsupp }, > { &vop_rename_desc, (vop_t *)vop_eopnotsupp }, > { &vop_rmdir_desc, (vop_t *)vop_eopnotsupp }, > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 10:56:38 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F6DF37B405; Wed, 8 Jan 2003 10:56:35 -0800 (PST) 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 4E91237B401 for ; Wed, 8 Jan 2003 10:56:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0177443E4A for ; Wed, 8 Jan 2003 10:56:35 -0800 (PST) (envelope-from green@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 h08IuYfh003800 for ; Wed, 8 Jan 2003 10:56:34 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h08IuY9G003797 for perforce@freebsd.org; Wed, 8 Jan 2003 10:56:34 -0800 (PST) Date: Wed, 8 Jan 2003 10:56:34 -0800 (PST) Message-Id: <200301081856.h08IuY9G003797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23436 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23436 Change 23436 by green@green_laptop_2 on 2003/01/08 10:56:25 Print out more info in truss(1) for sysctl(2) calls. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscall.h#4 edit .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/truss/syscall.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ */ enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad, - Signal, Sockaddr, StringArray }; + Signal, Sockaddr, StringArray, HexArray }; #define ARG_MASK 0xff #define OUT 0x100 ==== //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#8 (text+ko) ==== @@ -108,6 +108,9 @@ { { String | IN, 0 }, { StringArray | IN, 1 }, { StringArray | IN, 2 } } }, { "linux_execve", 1, 3, { { String | IN, 0 }, { StringArray | IN, 1 }, { StringArray | IN, 2 } } }, + { "__sysctl", 1, 6, + { { HexArray | IN, 0 }, { Int, 1 }, { Ptr | IN, 2 }, { Ptr | IN, 3 }, + { Ptr | OUT, 4 }, { Int, 5 } } }, { 0, 0, 0, { { 0, 0 }}}, }; @@ -241,6 +244,33 @@ tmp = malloc(12); sprintf(tmp, "%ld", args[sc->offset]); break; + case HexArray: + { + char *old; + int num, i, *ary; + + num = (int)args[sc[1].offset]; + if (num <= 0) { + asprintf(&tmp, "[]"); + break; + } + ary = malloc(sizeof(int) * num); + if (get_struct(fd, (void *)args[sc->offset], (void *)ary, + sizeof(int) * num) == -1) { + err(1, "get_struct %p", (void *)args[sc->offset]); + } + asprintf(&tmp, "[%#lx", ((int *)args[sc->offset])[0]); + for (i = 1; i < num; i++) { + old = tmp; + asprintf(&tmp, "%s, %#lx", old, ary[i]); + free(old); + } + old = tmp; + asprintf(&tmp, "%s]", old); + free(old); + free(ary); + } + break; case String: { char *tmp2; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 11:36:56 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD1B937B405; Wed, 8 Jan 2003 11:36:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 378AF37B401; Wed, 8 Jan 2003 11:36:54 -0800 (PST) Received: from green.bikeshed.org (up8rsrworn0umy7b@green.bikeshed.org [10.0.0.1] (may be forged)) by green.bikeshed.org (8.12.6/8.12.6) with ESMTP id h08Jahil058021; Wed, 8 Jan 2003 14:36:43 -0500 (EST) (envelope-from green@green.bikeshed.org) Received: from localhost (green@localhost) by green.bikeshed.org (8.12.6/8.12.6/Submit) with ESMTP id h08Jafob058017; Wed, 8 Jan 2003 14:36:43 -0500 (EST) Message-Id: <200301081936.h08Jafob058017@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23431 for review In-Reply-To: Your message of "Wed, 08 Jan 2003 13:45:19 EST." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 08 Jan 2003 14:36:41 -0500 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > Not all synthetic pseudofs file systems might be multilabel; does the > pseudofs model easily allow individual pseudofs file systems to set the > mount flags? If so, that might be a preferred model. Well, my thought on this matter is that all pseudofs filesystems are free to not implement the new associate entry point (like the devfs one) when I implement it, and they'll be effectively singlelabel filesystems by getting the single from the mount structure. I may be confused as to whether or not this will work, because SEBSD does create "valid" vnode labels without a create operation. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 8 16:35: 3 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D9CF37B405; Wed, 8 Jan 2003 16:34:39 -0800 (PST) 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 C7CB337B401 for ; Wed, 8 Jan 2003 16:34:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8977143F08 for ; Wed, 8 Jan 2003 16:34:37 -0800 (PST) (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 h090Ybfh026683 for ; Wed, 8 Jan 2003 16:34:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h090Ya0g026680 for perforce@freebsd.org; Wed, 8 Jan 2003 16:34:36 -0800 (PST) Date: Wed, 8 Jan 2003 16:34:36 -0800 (PST) Message-Id: <200301090034.h090Ya0g026680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23451 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23451 Change 23451 by peter@peter_daintree on 2003/01/08 16:34:34 IFC @23450 Affected files ... .. //depot/projects/ia64/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#7 integrate .. //depot/projects/ia64/etc/periodic/daily/150.clean-hoststat#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#2 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/ia64/sys/conf/files#55 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#20 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#9 integrate .. //depot/projects/ia64/sys/dev/zs/z8530reg.h#2 integrate .. //depot/projects/ia64/sys/dev/zs/z8530var.h#1 branch .. //depot/projects/ia64/sys/dev/zs/zs.c#4 integrate .. //depot/projects/ia64/sys/dev/zs/zs_sbus.c#1 branch .. //depot/projects/ia64/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/ia64/sys/modules/Makefile#32 integrate .. //depot/projects/ia64/sys/modules/gem/Makefile#1 branch .. //depot/projects/ia64/sys/modules/if_hme/Makefile#1 branch .. //depot/projects/ia64/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/ia64/sys/netinet6/ipcomp_core.c#4 integrate .. //depot/projects/ia64/sys/netkey/keydb.h#3 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#11 integrate .. //depot/projects/ia64/sys/ufs/ffs/fs.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#34 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#8 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#8 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#11 integrate Differences ... ==== //depot/projects/ia64/contrib/tcpdump/print-esp.c#4 (text+ko) ==== @@ -50,7 +50,7 @@ #endif #include -#include +#include #include "ip.h" #include "esp.h" ==== //depot/projects/ia64/etc/defaults/periodic.conf#7 (text+ko) ==== @@ -10,7 +10,7 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.22 2002/10/25 15:16:54 thomas Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.24 2003/01/08 18:52:32 wollman Exp $ # # What files override these defaults ? @@ -60,9 +60,8 @@ daily_clean_rwho_verbose="YES" # Mention files deleted # 150.clean-hoststat -daily_clean_hoststat_enable="YES" # Delete .hoststat daily -daily_clean_hoststat_days=3 # If not modified for -daily_clean_hoststat_verbose="YES" # Mention files deleted +daily_clean_hoststat_enable="YES" # Purge sendmail host + # status cache daily # 200.backup-passwd daily_backup_passwd_enable="YES" # Backup passwd & group ==== //depot/projects/ia64/etc/periodic/daily/150.clean-hoststat#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.6 2002/08/12 11:09:01 schweikh Exp $ +# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.7 2003/01/08 18:51:45 wollman Exp $ # # Remove stale files in /var/spool/.hoststat # @@ -14,34 +14,13 @@ case "$daily_clean_hoststat_enable" in [Yy][Ee][Ss]) - if [ -z "$daily_clean_hoststat_days" ]; then - echo '$daily_clean_hoststat_enable is enabled but' \ - '$daily_clean_hoststat_days is not set' - rc=2 - elif [ ! -d /var/spool/.hoststat ]; then - echo '$daily_clean_hoststat_enable is enabled but' \ - "/var/spool/.hoststat doesn't exist" + if [ -z "$(sendmail -bh 2>&1)" ]; then rc=2 else echo "" - echo "Removing stale files from /var/spool/.hoststat:" - - case "$daily_clean_hoststat_verbose" in - [Yy][Ee][Ss]) - print=-print;; - *) - print=;; - esac - - if [ -d /var/spool/.hoststat ]; then - cd /var/spool/.hoststat - rc=$(find . ! -name . -mtime +$daily_clean_hoststat_days \ - -delete $print | tee /dev/stderr | wc -l) - [ -z "$print" ] && rc=0 - [ $rc -gt 1 ] && rc=1 - else - rc=3 - fi + echo "Removing stale entries from sendmail host status cache:" + rc=0 + sendmail -bH || rc=1 fi;; *) rc=0;; ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#4 (text+ko) ==== @@ -24,8 +24,8 @@
@@ -36,10 +36,11 @@ &os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à - $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.3 2003/01/05 19:28:05 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.4 2003/01/08 17:57:41 hrs Exp $ 2002 + 2003 &os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#4 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -12,6 +12,7 @@ 2000 2001 2002 + 2003 The FreeBSD Documentation Project ==== //depot/projects/ia64/share/man/man5/periodic.conf.5#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/share/man/man5/periodic.conf.5,v 1.44 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.45 2003/01/08 18:51:45 wollman Exp $ .\" .Dd June 22, 2000 .Dt PERIODIC.CONF 5 @@ -236,18 +236,16 @@ .Pq Vt bool Set to .Dq YES -if you wish old files in -.Pa /var/spool/.hoststat -to be purged. -.It Va daily_clean_hoststat_days -.Pq Vt num -Set to the number of days that files must not have been modified before -they are deleted. -.It Va daily_clean_hoststat_verbose -.Pq Vt bool -Set to -.Dq YES -if you want the removed files to be reported in your daily output. +to run +.Ic sendmail -bH +to automatically purge stale entries from +.Xr sendmail 8 Ns 's +host status cache. +Files will be deleted using the same criteria as +.Nm sendmail +would normally use when determining whether to believe the cached information, +as configured in +.Pa /etc/mail/sendmail.cf . .It Va daily_backup_passwd_enable .Pq Vt bool Set to @@ -709,7 +707,8 @@ .Xr chkgrp 8 , .Xr dump 8 , .Xr newsyslog 8 , -.Xr periodic 8 +.Xr periodic 8 , +.Xr sendmail 8 .Sh HISTORY The .Nm ==== //depot/projects/ia64/sys/conf/files#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.743 2003/01/04 22:07:48 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.744 2003/01/08 23:36:59 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -793,7 +793,8 @@ dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card dev/xe/if_xe_pccard.c optional xe pccard -dev/zs/zs.c optional zs sbus +dev/zs/zs.c optional zs +dev/zs/zs_sbus.c optional zs sbus fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard ==== //depot/projects/ia64/sys/dev/ata/ata-pci.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.52 2003/01/08 16:51:41 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.53 2003/01/08 17:44:36 sos Exp $ */ #include "opt_ata.h" @@ -287,10 +287,22 @@ } return "Promise TX2 ATA100 controller"; + case 0x5275105a: + case 0x7275105a: + { + uintptr_t devid = 0; + + /* if we are on a SuperTrak SX6000 dont attach */ + if (!BUS_READ_IVAR(device_get_parent(GRANDPARENT(dev)), + GRANDPARENT(dev), PCI_IVAR_DEVID, &devid) && + devid == 0x09628086 && + pci_get_class(GRANDPARENT(dev)) == PCIC_BRIDGE) + break; + } + /* FALLTHROUGH */ + case 0x4d69105a: - case 0x5275105a: case 0x6269105a: - case 0x7275105a: return "Promise TX2 ATA133 controller"; case 0x00041103: ==== //depot/projects/ia64/sys/dev/gem/if_gem.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: gem.c,v 1.21 2002/06/01 23:50:58 lukem Exp * - * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.11 2003/01/06 22:09:01 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.12 2003/01/08 20:12:45 tmm Exp $ */ /* @@ -350,6 +350,55 @@ return (error); } +void +gem_detach(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + int i; + + ether_ifdetach(ifp); + gem_stop(ifp, 1); + device_delete_child(sc->sc_dev, sc->sc_miibus); + + for (i = 0; i < GEM_NRXDESC; i++) { + if (sc->sc_rxsoft[i].rxs_dmamap != NULL) + bus_dmamap_destroy(sc->sc_rdmatag, + sc->sc_rxsoft[i].rxs_dmamap); + } + for (i = 0; i < GEM_TXQUEUELEN; i++) { + if (sc->sc_txsoft[i].txs_dmamap != NULL) + bus_dmamap_destroy(sc->sc_tdmatag, + sc->sc_txsoft[i].txs_dmamap); + } + bus_dmamap_unload(sc->sc_cdmatag, sc->sc_cddmamap); + bus_dmamem_free(sc->sc_cdmatag, sc->sc_control_data, + sc->sc_cddmamap); + bus_dma_tag_destroy(sc->sc_cdmatag); + bus_dma_tag_destroy(sc->sc_tdmatag); + bus_dma_tag_destroy(sc->sc_rdmatag); + bus_dma_tag_destroy(sc->sc_pdmatag); +} + +void +gem_suspend(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + + gem_stop(ifp, 0); +} + +void +gem_resume(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + + if (ifp->if_flags & IFF_UP) + gem_init(ifp); +} + static void gem_cddma_callback(xsc, segs, nsegs, error) void *xsc; @@ -1833,43 +1882,3 @@ chipit: bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v); } - -#if notyet - -/* - * gem_power: - * - * Power management (suspend/resume) hook. - */ -void -static gem_power(why, arg) - int why; - void *arg; -{ - struct gem_softc *sc = arg; - struct ifnet *ifp = &sc->sc_arpcom.ac_if; - int s; - - s = splnet(); - switch (why) { - case PWR_SUSPEND: - case PWR_STANDBY: - gem_stop(ifp, 1); - if (sc->sc_power != NULL) - (*sc->sc_power)(sc, why); - break; - case PWR_RESUME: - if (ifp->if_flags & IFF_UP) { - if (sc->sc_power != NULL) - (*sc->sc_power)(sc, why); - gem_init(ifp); - } - break; - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; - } - splx(s); -} -#endif ==== //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: if_gem_pci.c,v 1.7 2001/10/18 15:09:15 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.5 2002/07/10 10:24:23 benno Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.6 2003/01/08 20:12:45 tmm Exp $ */ /* @@ -77,12 +77,19 @@ static int gem_pci_probe(device_t); static int gem_pci_attach(device_t); - +static int gem_pci_detach(device_t); +static int gem_pci_suspend(device_t); +static int gem_pci_resume(device_t); static device_method_t gem_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gem_pci_probe), DEVMETHOD(device_attach, gem_pci_attach), + DEVMETHOD(device_detach, gem_pci_detach), + DEVMETHOD(device_suspend, gem_pci_suspend), + DEVMETHOD(device_resume, gem_pci_resume), + /* Use the suspend handler here, it is all that is required. */ + DEVMETHOD(device_shutdown, gem_pci_suspend), /* bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -202,3 +209,40 @@ bus_release_resource(dev, SYS_RES_MEMORY, gsc->gsc_srid, gsc->gsc_sres); return (ENXIO); } + +static int +gem_pci_detach(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_detach(sc); + + bus_teardown_intr(dev, gsc->gsc_ires, gsc->gsc_ih); + bus_release_resource(dev, SYS_RES_IRQ, gsc->gsc_irid, gsc->gsc_ires); + bus_release_resource(dev, SYS_RES_MEMORY, gsc->gsc_srid, gsc->gsc_sres); + return (0); +} + +static int +gem_pci_suspend(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_suspend(sc); + return (0); +} + +static int +gem_pci_resume(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_resume(sc); + return (0); +} ==== //depot/projects/ia64/sys/dev/gem/if_gemvar.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp * - * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.5 2003/01/06 22:09:01 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.6 2003/01/08 20:12:45 tmm Exp $ */ #ifndef _IF_GEMVAR_H @@ -219,7 +219,9 @@ extern devclass_t gem_devclass; int gem_attach(struct gem_softc *); -int gem_detach(struct gem_softc *); +void gem_detach(struct gem_softc *); +void gem_suspend(struct gem_softc *); +void gem_resume(struct gem_softc *); void gem_intr(void *); int gem_mediachange(struct ifnet *); ==== //depot/projects/ia64/sys/dev/hme/if_hme.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.8 2003/01/06 22:12:57 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.9 2003/01/08 18:53:38 obrien Exp $ */ /* @@ -122,7 +122,7 @@ static int hme_nerr; DRIVER_MODULE(miibus, hme, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(hem, miibus, 1, 1, 1); +MODULE_DEPEND(hme, miibus, 1, 1, 1); #define HME_SPC_READ_4(spc, sc, offs) \ bus_space_read_4((sc)->sc_ ## spc ## t, (sc)->sc_ ## spc ## h, \ ==== //depot/projects/ia64/sys/dev/zs/z8530reg.h#2 (text+ko) ==== @@ -43,7 +43,7 @@ * * @(#)zsreg.h 8.1 (Berkeley) 6/11/93 * - * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.1 2003/01/01 19:49:29 jake Exp $ + * $FreeBSD: src/sys/dev/zs/z8530reg.h,v 1.2 2003/01/08 23:36:16 jake Exp $ */ /* @@ -90,16 +90,6 @@ */ #define ZS_NCHAN 2 -#define ZS_CHANLEN 4 - -#define ZS_CHAN_A 4 -#define ZS_CHAN_B 0 - -#define ZS_CSR 0 -#define ZS_DATA 2 - -#define ZS_CLOCK (9600 * 512) -#define ZS_CLOCK_DIV (16) #define ZSRR_IVEC 2 /* interrupt vector (channel 0) */ #define ZSRR_IPEND 3 /* interrupt pending (ch. 0 only) */ ==== //depot/projects/ia64/sys/dev/zs/zs.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/zs/zs.c,v 1.3 2003/01/08 04:30:30 jake Exp $ + * $FreeBSD: src/sys/dev/zs/zs.c,v 1.4 2003/01/08 23:36:16 jake Exp $ */ /* @@ -96,101 +96,32 @@ #include -#include -#include - #include +#include #define CDEV_MAJOR 182 #define ZS_READ(sc, r) \ - bus_space_read_1((sc)->sc_bt, (sc)->sc_bh, (r)) + bus_space_read_1((sc)->sc_bt, (r), 0) #define ZS_WRITE(sc, r, v) \ - bus_space_write_1((sc)->sc_bt, (sc)->sc_bh, (r), (v)) + bus_space_write_1((sc)->sc_bt, (r), 0, (v)) #define ZS_READ_REG(sc, r) ({ \ - ZS_WRITE((sc), ZS_CSR, (r)); \ - ZS_READ((sc), ZS_CSR); \ + ZS_WRITE((sc), (sc)->sc_csr, (r)); \ + ZS_READ((sc), (sc)->sc_csr); \ }) #define ZS_WRITE_REG(sc, r, v) ({ \ - ZS_WRITE((sc), ZS_CSR, (r)); \ - ZS_WRITE((sc), ZS_CSR, (v)); \ + ZS_WRITE((sc), (sc)->sc_csr, (r)); \ + ZS_WRITE((sc), (sc)->sc_csr, (v)); \ }) #define ZSTTY_LOCK(sz) mtx_lock_spin(&(sc)->sc_mtx) #define ZSTTY_UNLOCK(sz) mtx_unlock_spin(&(sc)->sc_mtx) -struct zstty_softc { - device_t sc_dev; - struct zs_softc *sc_parent; - bus_space_tag_t sc_bt; - bus_space_handle_t sc_bh; - dev_t sc_si; - struct tty *sc_tty; - int sc_channel; - int sc_icnt; - uint8_t *sc_iput; - uint8_t *sc_iget; - int sc_ocnt; - uint8_t *sc_oget; - int sc_brg_clk; - int sc_alt_break_state; - struct mtx sc_mtx; - uint8_t sc_console; - uint8_t sc_tx_busy; - uint8_t sc_tx_done; - uint8_t sc_preg_held; - uint8_t sc_creg[16]; - uint8_t sc_preg[16]; - uint8_t sc_ibuf[CBLOCK]; - uint8_t sc_obuf[CBLOCK]; -}; - -struct zs_softc { - device_t sc_dev; - bus_space_tag_t sc_bt; - bus_space_handle_t sc_bh; - struct zstty_softc *sc_child[ZS_NCHAN]; - void *sc_ih; - void *sc_softih; - struct resource *sc_irqres; - int sc_irqrid; - struct resource *sc_memres; - int sc_memrid; -}; - -static uint8_t zs_init_reg[16] = { - 0, /* 0: CMD (reset, etc.) */ - 0, /* 1: No interrupts yet. */ - 0, /* 2: IVECT */ - ZSWR3_RX_8 | ZSWR3_RX_ENABLE, - ZSWR4_CLK_X16 | ZSWR4_ONESB | ZSWR4_EVENP, - ZSWR5_TX_8 | ZSWR5_TX_ENABLE, - 0, /* 6: TXSYNC/SYNCLO */ - 0, /* 7: RXSYNC/SYNCHI */ - 0, /* 8: alias for data port */ - ZSWR9_MASTER_IE | ZSWR9_NO_VECTOR, - 0, /* 10: Misc. TX/RX control bits */ - ZSWR11_TXCLK_BAUD | ZSWR11_RXCLK_BAUD, - ((ZS_CLOCK/32)/9600)-2, - 0, - ZSWR14_BAUD_ENA | ZSWR14_BAUD_FROM_PCLK, - ZSWR15_BREAK_IE, -}; - -static int zs_probe(device_t dev); -static int zs_attach(device_t dev); -static int zs_detach(device_t dev); - -static void zs_intr(void *v); static void zs_softintr(void *v); static void zs_shutdown(void *v); -static int zstty_probe(device_t dev); -static int zstty_attach(device_t dev); -static int zstty_detach(device_t dev); - static int zstty_intr(struct zstty_softc *sc, uint8_t rr3); static void zstty_softintr(struct zstty_softc *sc) __unused; static int zstty_mdmctrl(struct zstty_softc *sc, int bits, int how); @@ -199,8 +130,6 @@ static void zstty_flush(struct zstty_softc *sc) __unused; static int zstty_speed(struct zstty_softc *sc, int rate); static void zstty_load_regs(struct zstty_softc *sc); -static int zstty_console(device_t dev, char *mode, int len); -static int zstty_keyboard(device_t dev); static cn_probe_t zs_cnprobe; static cn_init_t zs_cninit; @@ -239,92 +168,28 @@ /* kqfilter */ ttykqfilter, }; -static device_method_t zs_methods[] = { - DEVMETHOD(device_probe, zs_probe), - DEVMETHOD(device_attach, zs_attach), - DEVMETHOD(device_detach, zs_detach), - - DEVMETHOD(bus_print_child, bus_generic_print_child), - - { 0, 0 } -}; - -static device_method_t zstty_methods[] = { - DEVMETHOD(device_probe, zstty_probe), - DEVMETHOD(device_attach, zstty_attach), - DEVMETHOD(device_detach, zstty_detach), - - { 0, 0 } -}; - -static driver_t zs_driver = { - "zs", - zs_methods, - sizeof(struct zs_softc), -}; - -static driver_t zstty_driver = { - "zstty", - zstty_methods, - sizeof(struct zstty_softc), -}; - -static devclass_t zs_devclass; -static devclass_t zstty_devclass; - static struct zstty_softc *zstty_cons; -DRIVER_MODULE(zs, sbus, zs_driver, zs_devclass, 0, 0); -DRIVER_MODULE(zstty, zs, zstty_driver, zstty_devclass, 0, 0); - CONS_DRIVER(zs, zs_cnprobe, zs_cninit, zs_cnterm, zs_cngetc, zs_cncheckc, zs_cnputc, zs_cndbctl); -static int +int zs_probe(device_t dev) { - if (strcmp(sbus_get_name(dev), "zs") != 0 || - device_get_unit(dev) != 0) - return (ENXIO); device_set_desc(dev, "Zilog Z8530"); return (0); } -static int +int zs_attach(device_t dev) { struct device *child[ZS_NCHAN]; - struct resource *irqres; - struct resource *memres; struct zs_softc *sc; - int irqrid; - int memrid; int i; - irqrid = 0; - irqres = NULL; - memres = NULL; - memrid = 0; sc = device_get_softc(dev); - memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &memrid, 0, ~0, 1, - RF_ACTIVE); - if (memres == NULL) - goto error; - irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &irqrid, 0, ~0, 1, - RF_ACTIVE); - if (irqres == NULL) - goto error; - if (bus_setup_intr(dev, irqres, INTR_TYPE_TTY | INTR_FAST, zs_intr, - sc, &sc->sc_ih) != 0) - goto error; sc->sc_dev = dev; - sc->sc_irqres = irqres; - sc->sc_irqrid = irqrid; - sc->sc_memres = memres; - sc->sc_memrid = memrid; - sc->sc_bt = rman_get_bustag(memres); - sc->sc_bh = rman_get_bushandle(memres); for (i = 0; i < ZS_NCHAN; i++) child[i] = device_add_child(dev, "zstty", -1); @@ -335,8 +200,8 @@ swi_add(&tty_ithd, "tty:zs", zs_softintr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); - ZS_WRITE_REG(sc->sc_child[0], 2, zs_init_reg[2]); - ZS_WRITE_REG(sc->sc_child[0], 9, zs_init_reg[9]); + ZS_WRITE_REG(sc->sc_child[0], 2, sc->sc_child[0]->sc_creg[2]); + ZS_WRITE_REG(sc->sc_child[0], 9, sc->sc_child[0]->sc_creg[9]); if (zstty_cons != NULL) { DELAY(50000); @@ -347,23 +212,9 @@ SHUTDOWN_PRI_DEFAULT); return (0); - -error: - if (irqres != NULL) - bus_release_resource(dev, SYS_RES_IRQ, irqrid, irqres); - if (memres != NULL) - bus_release_resource(dev, SYS_RES_MEMORY, memrid, memres); - return (ENXIO); } -static int -zs_detach(device_t dev) -{ - - return (bus_generic_detach(dev)); -} - -static void +void zs_intr(void *v) { struct zs_softc *sc = v; @@ -378,14 +229,10 @@ */ needsoft = 0; rr3 = ZS_READ_REG(sc->sc_child[0], 3); - if ((rr3 & (ZSRR3_IP_A_RX | ZSRR3_IP_A_TX | ZSRR3_IP_A_STAT)) != 0) { - ZS_WRITE(sc->sc_child[0], ZS_CSR, ZSWR0_CLR_INTR); + if ((rr3 & (ZSRR3_IP_A_RX | ZSRR3_IP_A_TX | ZSRR3_IP_A_STAT)) != 0) needsoft |= zstty_intr(sc->sc_child[0], rr3 >> 3); - } - if ((rr3 & (ZSRR3_IP_B_RX | ZSRR3_IP_B_TX | ZSRR3_IP_B_STAT)) != 0) { - ZS_WRITE(sc->sc_child[1], ZS_CSR, ZSWR0_CLR_INTR); + if ((rr3 & (ZSRR3_IP_B_RX | ZSRR3_IP_B_TX | ZSRR3_IP_B_STAT)) != 0) needsoft |= zstty_intr(sc->sc_child[1], rr3); - } if (needsoft) swi_sched(sc->sc_softih, 0); } @@ -404,25 +251,13 @@ { } -static int +int zstty_probe(device_t dev) { - - if (zstty_keyboard(dev)) { - if ((device_get_unit(dev) & 1) == 0) - device_set_desc(dev, "keyboard"); - else - device_set_desc(dev, "mouse"); - } else { - if ((device_get_unit(dev) & 1) == 0) - device_set_desc(dev, "ttya"); - else - device_set_desc(dev, "ttyb"); - } return (0); } -static int +int zstty_attach(device_t dev) { struct zstty_softc *sc; @@ -437,24 +272,9 @@ sc = device_get_softc(dev); mtx_init(&sc->sc_mtx, "zstty", NULL, MTX_SPIN); sc->sc_dev = dev; - sc->sc_parent = device_get_softc(device_get_parent(dev)); - sc->sc_bt = sc->sc_parent->sc_bt; - sc->sc_channel = device_get_unit(dev) & 1; - sc->sc_brg_clk = ZS_CLOCK / ZS_CLOCK_DIV; sc->sc_iput = sc->sc_iget = sc->sc_ibuf; sc->sc_oget = sc->sc_obuf; - switch (sc->sc_channel) { - case 0: - bus_space_subregion(sc->sc_bt, sc->sc_parent->sc_bh, - ZS_CHAN_A, ZS_CHANLEN, &sc->sc_bh); - break; - case 1: - bus_space_subregion(sc->sc_bt, sc->sc_parent->sc_bh, - ZS_CHAN_B, ZS_CHANLEN, &sc->sc_bh); - break; - } - tp = ttymalloc(NULL); sc->sc_si = make_dev(&zstty_cdevsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0600, "%s", device_get_desc(dev)); @@ -473,11 +293,9 @@ tp->t_ospeed = TTYDEF_SPEED; tp->t_ispeed = TTYDEF_SPEED; - bcopy(zs_init_reg, sc->sc_creg, 16); - bcopy(zs_init_reg, sc->sc_preg, 16); - if (zstty_console(dev, mode, sizeof(mode))) { ttychars(tp); + /* format: 9600,8,n,1,- */ if (sscanf(mode, "%d,%d,%c,%d,%c", &baud, &clen, &parity, &stop, &c) == 5) { tp->t_ospeed = baud; @@ -515,13 +333,6 @@ return (0); } -static int -zstty_detach(device_t dev) -{ - - return (bus_generic_detach(dev)); -} - /* * Note that the rr3 value is shifted so the channel a status bits are in the * channel b bit positions, which makes the bit positions uniform for both @@ -538,6 +349,8 @@ ZSTTY_LOCK(sc); + ZS_WRITE(sc, sc->sc_csr, ZSWR0_CLR_INTR); + brk = 0; needsoft = 0; if ((rr3 & ZSRR3_IP_B_RX) != 0) { @@ -548,10 +361,10 @@ * char destroys the status of this char. */ rr1 = ZS_READ_REG(sc, 1); - c = ZS_READ(sc, ZS_DATA); + c = ZS_READ(sc, sc->sc_data); if ((rr1 & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) - ZS_WRITE(sc, ZS_CSR, ZSWR0_RESET_ERRORS); + ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_ERRORS); #if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_console != 0) brk = db_alt_break(c, &sc->sc_alt_break_state); @@ -560,12 +373,12 @@ *sc->sc_iput++ = rr1; if (sc->sc_iput == sc->sc_ibuf + sizeof(sc->sc_ibuf)) sc->sc_iput = sc->sc_ibuf; - } while ((ZS_READ(sc, ZS_CSR) & ZSRR0_RX_READY) != 0); + } while ((ZS_READ(sc, sc->sc_csr) & ZSRR0_RX_READY) != 0); } if ((rr3 & ZSRR3_IP_B_STAT) != 0) { - rr0 = ZS_READ(sc, ZS_CSR); - ZS_WRITE(sc, ZS_CSR, ZSWR0_RESET_STATUS); + rr0 = ZS_READ(sc, sc->sc_csr); + ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_STATUS); #if defined(DDB) && defined(BREAK_TO_DEBUGGER) if (sc->sc_console != 0 && (rr0 & ZSRR0_BREAK) != 0) brk = 1; @@ -582,7 +395,7 @@ zstty_load_regs(sc); } if (sc->sc_ocnt > 0) { - ZS_WRITE(sc, ZS_DATA, *sc->sc_oget++); + ZS_WRITE(sc, sc->sc_data, *sc->sc_oget++); sc->sc_ocnt--; } else { /* @@ -815,7 +628,7 @@ sc->sc_creg[1] = sc->sc_preg[1]; ZS_WRITE_REG(sc, 1, sc->sc_creg[1]); } - ZS_WRITE(sc, ZS_DATA, c); + ZS_WRITE(sc, sc->sc_data, c); ttwwakeup(tp); } @@ -928,8 +741,8 @@ sc->sc_preg[3] = wr3; sc->sc_preg[4] = wr4; sc->sc_preg[5] = wr5; - sc->sc_preg[12] = ospeed; - sc->sc_preg[13] = ospeed >> 8; + + zstty_set_speed(sc, ospeed); if (cflag & CRTSCTS) sc->sc_preg[15] |= ZSWR15_CTS_IE; @@ -951,15 +764,15 @@ uint8_t c; for (;;) { - rr0 = ZS_READ(sc, ZS_CSR); + rr0 = ZS_READ(sc, sc->sc_csr); if ((rr0 & ZSRR0_RX_READY) == 0) break; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 9 12:38:11 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F038D37B405; Thu, 9 Jan 2003 12:37:45 -0800 (PST) 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 4B23837B405 for ; Thu, 9 Jan 2003 12:37:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2C2643F5F for ; Thu, 9 Jan 2003 12:37:43 -0800 (PST) (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 h09Kbhfh058167 for ; Thu, 9 Jan 2003 12:37:43 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h09KbgBR058163 for perforce@freebsd.org; Thu, 9 Jan 2003 12:37:42 -0800 (PST) Date: Thu, 9 Jan 2003 12:37:42 -0800 (PST) Message-Id: <200301092037.h09KbgBR058163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 23502 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23502 Change 23502 by jhb@jhb_laptop on 2003/01/09 12:37:01 IFC @23498. Affected files ... .. //depot/projects/smpng/sys/conf/files#61 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#9 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#12 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usbcdc.h#2 integrate .. //depot/projects/smpng/sys/dev/zs/z8530reg.h#2 integrate .. //depot/projects/smpng/sys/dev/zs/z8530var.h#1 branch .. //depot/projects/smpng/sys/dev/zs/zs.c#3 integrate .. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#1 branch .. //depot/projects/smpng/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#13 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#16 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#68 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#25 integrate .. //depot/projects/smpng/sys/modules/Makefile#42 integrate .. //depot/projects/smpng/sys/modules/gem/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hme/Makefile#1 branch .. //depot/projects/smpng/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_core.c#4 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/smpng/sys/netkey/keydb.h#3 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#12 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#5 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/interrupt.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#31 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#22 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#10 integrate .. //depot/projects/smpng/sys/sys/syscall.h#25 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#25 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#10 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#27 integrate Differences ... ==== //depot/projects/smpng/sys/conf/files#61 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.743 2003/01/04 22:07:48 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.744 2003/01/08 23:36:59 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -791,7 +791,8 @@ dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card dev/xe/if_xe_pccard.c optional xe pccard -dev/zs/zs.c optional zs sbus +dev/zs/zs.c optional zs +dev/zs/zs_sbus.c optional zs sbus fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard ==== //depot/projects/smpng/sys/conf/files.powerpc#11 (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.powerpc,v 1.20 2002/09/19 05:11:15 grehan Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.21 2003/01/09 12:04:18 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -68,6 +68,7 @@ powerpc/powerpc/mp_machdep.c optional smp powerpc/ofw/ofw_pci.c optional pci +powerpc/ofw/ofw_pcib_pci.c optional pci powerpc/powermac/uninorth.c optional powermac pci powerpc/powermac/macio.c optional powermac pci ==== //depot/projects/smpng/sys/dev/ata/ata-cbus.c#3 (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-cbus.c,v 1.2 2002/12/17 16:26:22 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.3 2003/01/09 14:00:07 sos Exp $ */ #include "opt_ata.h" @@ -60,6 +60,10 @@ int rid; u_long tmp; + /* dont probe PnP devices */ + if (isa_get_vendorid(dev)) + return (ENXIO); + /* allocate the ioport range */ rid = ATA_IOADDR_RID; io = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, ata_pc98_ports, ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#26 (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-dma.c,v 1.106 2002/12/03 20:19:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.109 2003/01/09 13:54:07 sos Exp $ */ #include @@ -502,6 +502,7 @@ break; case 0x01bc10de: /* nVIDIA nForce */ + case 0x006510de: /* nVIDIA nForce2 */ case 0x74411022: /* AMD 768 */ case 0x74111022: /* AMD 766 */ case 0x74091022: /* AMD 756 */ @@ -512,7 +513,8 @@ { 0x00, 0x00, 0xea, 0x00, 0xe8, 0x00, 0x00 }, /* VIA ATA66 */ { 0x00, 0x00, 0xf4, 0x00, 0xf1, 0xf0, 0x00 }, /* VIA ATA100 */ { 0x00, 0x00, 0xf6, 0x00, 0xf2, 0xf1, 0xf0 }, /* VIA ATA133 */ - { 0x00, 0x00, 0xc0, 0x00, 0xc5, 0xc6, 0x00 }}; /* AMD/nVIDIA */ + { 0x00, 0x00, 0xc0, 0x00, 0xc5, 0xc6, 0xc7 }}; /* AMD/nVIDIA */ + int reg = 0x53 - devno; int *reg_val = NULL; char *chip = "VIA"; @@ -553,14 +555,24 @@ reg_val = via_modes[4]; chip = "AMD"; } - else if (chiptype == 0x01bc10de) { /* nVIDIA */ + else if (chiptype == 0x006510de) { /* nForce2 */ + udmamode = imin(udmamode, 6); + reg += 0x10; + reg_val = via_modes[4]; + chip = "nVidia"; + } + else if (chiptype == 0x01bc10de) { /* nForce */ udmamode = imin(udmamode, 5); + reg += 0x10; reg_val = via_modes[4]; - chip = "nVIDIA"; + chip = "nVidia"; } else udmamode = 0; + if (udmamode || wdmamode) + pci_write_config(parent, reg - 0x08, 0x20, 1); + if (udmamode >= 6) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, ATA_UDMA6, ATA_C_F_SETXFER, ATA_WAIT_READY); @@ -568,7 +580,7 @@ ata_prtdev(atadev, "%s setting UDMA6 on %s chip\n", (error) ? "failed" : "success", chip); if (!error) { - pci_write_config(parent, 0x53 - devno, reg_val[6], 1); + pci_write_config(parent, reg, reg_val[6], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA6); return; } @@ -580,7 +592,7 @@ ata_prtdev(atadev, "%s setting UDMA5 on %s chip\n", (error) ? "failed" : "success", chip); if (!error) { - pci_write_config(parent, 0x53 - devno, reg_val[5], 1); + pci_write_config(parent, reg, reg_val[5], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA5); return; } @@ -592,7 +604,7 @@ ata_prtdev(atadev, "%s setting UDMA4 on %s chip\n", (error) ? "failed" : "success", chip); if (!error) { - pci_write_config(parent, 0x53 - devno, reg_val[4], 1); + pci_write_config(parent, reg, reg_val[4], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA4); return; } @@ -604,7 +616,7 @@ ata_prtdev(atadev, "%s setting UDMA2 on %s chip\n", (error) ? "failed" : "success", chip); if (!error) { - pci_write_config(parent, 0x53 - devno, reg_val[2], 1); + pci_write_config(parent, reg, reg_val[2], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA2); return; } @@ -616,8 +628,8 @@ ata_prtdev(atadev, "%s setting WDMA2 on %s chip\n", (error) ? "failed" : "success", chip); if (!error) { - pci_write_config(parent, 0x53 - devno, 0x0b, 1); - pci_write_config(parent, 0x4b - devno, 0x31, 1); + pci_write_config(parent, reg, 0x0b, 1); + pci_write_config(parent, reg - 0x08, 0x31, 1); ata_dmacreate(atadev, apiomode, ATA_WDMA2); return; } @@ -1325,7 +1337,7 @@ } if (udmamode >= 2) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, - ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY); + ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) ata_prtdev(atadev, "%s setting up UDMA2 mode on Acard chip\n", (error) ? "failed" : "success"); @@ -1510,6 +1522,19 @@ if (ds->flags & ATA_DS_ACTIVE) panic("ata_dmasetup: transfer active on this device!"); + switch(ch->chiptype) { + case 0x0d38105a: /* Promise Fasttrak 66 */ + case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ + case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ + ATA_OUTB(ch->r_bmio, 0x11, + ATA_INB(ch->r_bmio, 0x11) | (atadev->unit ? 0x08 : 0x02)); + + ATA_OUTL(ch->r_bmio, (atadev->unit ? 0x24 : 0x20), + (dir ? 0x05000000 : 0x06000000) | (count >> 1)); + break; + } + cba.dmatab = ds->dmatab; bus_dmamap_sync(ds->cdmatag, ds->cdmamap, BUS_DMASYNC_PREWRITE); if (bus_dmamap_load(ds->ddmatag, ds->ddmamap, data, count, @@ -1521,33 +1546,40 @@ BUS_DMASYNC_PREWRITE); ch->flags |= ATA_DMA_ACTIVE; - ds->flags = ATA_DS_ACTIVE; - if (dir) - ds->flags |= ATA_DS_READ; + ds->flags = dir ? (ATA_DS_ACTIVE | ATA_DS_READ) : ATA_DS_ACTIVE; ATA_OUTL(ch->r_bmio, ATA_BMDTP_PORT, ds->mdmatab); ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT, dir ? ATA_BMCMD_WRITE_READ : 0); ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT, - (ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) | - (ATA_BMSTAT_INTERRUPT | ATA_BMSTAT_ERROR))); + (ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) | + (ATA_BMSTAT_INTERRUPT | ATA_BMSTAT_ERROR))); ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT, - ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) | ATA_BMCMD_START_STOP); + ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) | ATA_BMCMD_START_STOP); return 0; } int ata_dmadone(struct ata_device *atadev) { - struct ata_channel *ch; - struct ata_dmastate *ds; + struct ata_channel *ch = atadev->channel; + struct ata_dmastate *ds = &atadev->dmastate; int error; - ch = atadev->channel; - ds = &atadev->dmastate; + switch(ch->chiptype) { + case 0x0d38105a: /* Promise Fasttrak 66 */ + case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ + case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ + ATA_OUTL(ch->r_bmio, (atadev->unit ? 0x24 : 0x20), 0); + ATA_OUTB(ch->r_bmio, 0x11, + ATA_INB(ch->r_bmio, 0x11) & ~(atadev->unit ? 0x08 : 0x02)); + break; + } + bus_dmamap_sync(ds->ddmatag, ds->ddmamap, (ds->flags & ATA_DS_READ) != 0 ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(ds->ddmatag, ds->ddmamap); - + ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT, ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) & ~ATA_BMCMD_START_STOP); error = ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT); ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.51 2002/12/03 20:19:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.53 2003/01/08 17:44:36 sos Exp $ */ #include "opt_ata.h" @@ -234,7 +234,10 @@ return "AMD 768 ATA100 controller"; case 0x01bc10de: - return "nVIDIA nForce ATA100 controller"; + return "nVidia nForce ATA100 controller"; + + case 0x006510de: + return "nVidia nForce ATA133 controller"; case 0x02111166: return "ServerWorks ROSB4 ATA33 controller"; @@ -284,10 +287,22 @@ } return "Promise TX2 ATA100 controller"; + case 0x5275105a: + case 0x7275105a: + { + uintptr_t devid = 0; + + /* if we are on a SuperTrak SX6000 dont attach */ + if (!BUS_READ_IVAR(device_get_parent(GRANDPARENT(dev)), + GRANDPARENT(dev), PCI_IVAR_DEVID, &devid) && + devid == 0x09628086 && + pci_get_class(GRANDPARENT(dev)) == PCIC_BRIDGE) + break; + } + /* FALLTHROUGH */ + case 0x4d69105a: - case 0x5275105a: case 0x6269105a: - case 0x7275105a: return "Promise TX2 ATA133 controller"; case 0x00041103: ==== //depot/projects/smpng/sys/dev/firewire/firewire.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.17 2003/01/07 04:26:45 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.18 2003/01/09 10:25:07 simokawa Exp $ * */ @@ -289,6 +289,7 @@ STAILQ_REMOVE_HEAD(&ir->stfree, link); } }else{ + device_printf(fc->bdev, "no free chunk available\n"); bulkxfer = STAILQ_FIRST(&ir->stvalid); STAILQ_REMOVE_HEAD(&ir->stvalid, link); } ==== //depot/projects/smpng/sys/dev/firewire/fwohci.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.15 2003/01/05 14:58:45 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.16 2003/01/09 10:25:07 simokawa Exp $ * */ @@ -1485,11 +1485,12 @@ struct fwohci_softc *sc = (struct fwohci_softc *)fc; int err = 0; unsigned short tag, ich; - tag = (sc->ir[dmach].xferq.flag >> 6) & 3; - ich = sc->ir[dmach].xferq.flag & 0x3f; - OWRITE(sc, OHCI_IRMATCH(dmach), tagbit[tag] | ich); if(!(sc->ir[dmach].xferq.flag & FWXFERQ_RUNNING)){ + tag = (sc->ir[dmach].xferq.flag >> 6) & 3; + ich = sc->ir[dmach].xferq.flag & 0x3f; + OWRITE(sc, OHCI_IRMATCH(dmach), tagbit[tag] | ich); + sc->ir[dmach].xferq.queued = 0; sc->ir[dmach].ndb = sc->ir[dmach].xferq.bnpacket * sc->ir[dmach].xferq.bnchunk; @@ -1539,8 +1540,8 @@ OWRITE(sc, OHCI_IRCMD(dmach), vtophys(((struct fwohcidb_tr *)(sc->ir[dmach].xferq.stdma->start))->db) | sc->ir[dmach].ndesc); OWRITE(sc, OHCI_IRCTL(dmach), OHCI_CNTL_DMA_RUN); + OWRITE(sc, FWOHCI_INTMASK, OHCI_INT_DMA_IR); } - OWRITE(sc, FWOHCI_INTMASK, OHCI_INT_DMA_IR); return err; } @@ -1922,6 +1923,7 @@ fwohci_irx_enable(&sc->fc, dmach); break; default: + device_printf(sc->fc.dev, "Isochronous receive err %02x\n", stat); break; } } ==== //depot/projects/smpng/sys/dev/gem/if_gem.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: gem.c,v 1.21 2002/06/01 23:50:58 lukem Exp * - * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.11 2003/01/06 22:09:01 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.12 2003/01/08 20:12:45 tmm Exp $ */ /* @@ -350,6 +350,55 @@ return (error); } +void +gem_detach(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + int i; + + ether_ifdetach(ifp); + gem_stop(ifp, 1); + device_delete_child(sc->sc_dev, sc->sc_miibus); + + for (i = 0; i < GEM_NRXDESC; i++) { + if (sc->sc_rxsoft[i].rxs_dmamap != NULL) + bus_dmamap_destroy(sc->sc_rdmatag, + sc->sc_rxsoft[i].rxs_dmamap); + } + for (i = 0; i < GEM_TXQUEUELEN; i++) { + if (sc->sc_txsoft[i].txs_dmamap != NULL) + bus_dmamap_destroy(sc->sc_tdmatag, + sc->sc_txsoft[i].txs_dmamap); + } + bus_dmamap_unload(sc->sc_cdmatag, sc->sc_cddmamap); + bus_dmamem_free(sc->sc_cdmatag, sc->sc_control_data, + sc->sc_cddmamap); + bus_dma_tag_destroy(sc->sc_cdmatag); + bus_dma_tag_destroy(sc->sc_tdmatag); + bus_dma_tag_destroy(sc->sc_rdmatag); + bus_dma_tag_destroy(sc->sc_pdmatag); +} + +void +gem_suspend(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + + gem_stop(ifp, 0); +} + +void +gem_resume(sc) + struct gem_softc *sc; +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + + if (ifp->if_flags & IFF_UP) + gem_init(ifp); +} + static void gem_cddma_callback(xsc, segs, nsegs, error) void *xsc; @@ -1833,43 +1882,3 @@ chipit: bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v); } - -#if notyet - -/* - * gem_power: - * - * Power management (suspend/resume) hook. - */ -void -static gem_power(why, arg) - int why; - void *arg; -{ - struct gem_softc *sc = arg; - struct ifnet *ifp = &sc->sc_arpcom.ac_if; - int s; - - s = splnet(); - switch (why) { - case PWR_SUSPEND: - case PWR_STANDBY: - gem_stop(ifp, 1); - if (sc->sc_power != NULL) - (*sc->sc_power)(sc, why); - break; - case PWR_RESUME: - if (ifp->if_flags & IFF_UP) { - if (sc->sc_power != NULL) - (*sc->sc_power)(sc, why); - gem_init(ifp); - } - break; - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; - } - splx(s); -} -#endif ==== //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: if_gem_pci.c,v 1.7 2001/10/18 15:09:15 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.5 2002/07/10 10:24:23 benno Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.6 2003/01/08 20:12:45 tmm Exp $ */ /* @@ -77,12 +77,19 @@ static int gem_pci_probe(device_t); static int gem_pci_attach(device_t); - +static int gem_pci_detach(device_t); +static int gem_pci_suspend(device_t); +static int gem_pci_resume(device_t); static device_method_t gem_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gem_pci_probe), DEVMETHOD(device_attach, gem_pci_attach), + DEVMETHOD(device_detach, gem_pci_detach), + DEVMETHOD(device_suspend, gem_pci_suspend), + DEVMETHOD(device_resume, gem_pci_resume), + /* Use the suspend handler here, it is all that is required. */ + DEVMETHOD(device_shutdown, gem_pci_suspend), /* bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -202,3 +209,40 @@ bus_release_resource(dev, SYS_RES_MEMORY, gsc->gsc_srid, gsc->gsc_sres); return (ENXIO); } + +static int +gem_pci_detach(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_detach(sc); + + bus_teardown_intr(dev, gsc->gsc_ires, gsc->gsc_ih); + bus_release_resource(dev, SYS_RES_IRQ, gsc->gsc_irid, gsc->gsc_ires); + bus_release_resource(dev, SYS_RES_MEMORY, gsc->gsc_srid, gsc->gsc_sres); + return (0); +} + +static int +gem_pci_suspend(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_suspend(sc); + return (0); +} + +static int +gem_pci_resume(dev) + device_t dev; +{ + struct gem_pci_softc *gsc = device_get_softc(dev); + struct gem_softc *sc = &gsc->gsc_gem; + + gem_resume(sc); + return (0); +} ==== //depot/projects/smpng/sys/dev/gem/if_gemvar.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp * - * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.5 2003/01/06 22:09:01 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.6 2003/01/08 20:12:45 tmm Exp $ */ #ifndef _IF_GEMVAR_H @@ -219,7 +219,9 @@ extern devclass_t gem_devclass; int gem_attach(struct gem_softc *); -int gem_detach(struct gem_softc *); +void gem_detach(struct gem_softc *); +void gem_suspend(struct gem_softc *); +void gem_resume(struct gem_softc *); void gem_intr(void *); int gem_mediachange(struct ifnet *); ==== //depot/projects/smpng/sys/dev/hme/if_hme.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.8 2003/01/06 22:12:57 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.10 2003/01/09 00:45:10 tmm Exp $ */ /* @@ -90,9 +90,6 @@ static int hme_ioctl(struct ifnet *, u_long, caddr_t); static void hme_tick(void *); static void hme_watchdog(struct ifnet *); -#if 0 -static void hme_shutdown(void *); -#endif static void hme_init(void *); static int hme_add_rxbuf(struct hme_softc *, unsigned int, int); static int hme_meminit(struct hme_softc *); @@ -122,7 +119,7 @@ static int hme_nerr; DRIVER_MODULE(miibus, hme, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(hem, miibus, 1, 1, 1); +MODULE_DEPEND(hme, miibus, 1, 1, 1); #define HME_SPC_READ_4(spc, sc, offs) \ bus_space_read_4((sc)->sc_ ## spc ## t, (sc)->sc_ ## spc ## h, \ @@ -345,6 +342,49 @@ return (error); } +void +hme_detach(struct hme_softc *sc) +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + int i; + + ether_ifdetach(ifp); + hme_stop(sc); + device_delete_child(sc->sc_dev, sc->sc_miibus); + + for (i = 0; i < HME_NTXQ; i++) { + bus_dmamap_destroy(sc->sc_tdmatag, + sc->sc_rb.rb_txdesc[i].htx_dmamap); + } + bus_dmamap_destroy(sc->sc_rdmatag, sc->sc_rb.rb_spare_dmamap); + for (i = 0; i < HME_NRXDESC; i++) { + bus_dmamap_destroy(sc->sc_rdmatag, + sc->sc_rb.rb_rxdesc[i].hrx_dmamap); + } + bus_dmamap_unload(sc->sc_cdmatag, sc->sc_cdmamap); + bus_dmamem_free(sc->sc_cdmatag, sc->sc_rb.rb_membase, sc->sc_cdmamap); + bus_dma_tag_destroy(sc->sc_tdmatag); + bus_dma_tag_destroy(sc->sc_rdmatag); + bus_dma_tag_destroy(sc->sc_cdmatag); + bus_dma_tag_destroy(sc->sc_pdmatag); +} + +void +hme_suspend(struct hme_softc *sc) +{ + + hme_stop(sc); +} + +void +hme_resume(struct hme_softc *sc) +{ + struct ifnet *ifp = &sc->sc_arpcom.ac_if; + + if ((ifp->if_flags & IFF_UP) != 0) + hme_init(ifp); +} + static void hme_cdma_callback(void *xsc, bus_dma_segment_t *segs, int nsegs, int error) { @@ -1342,15 +1382,6 @@ return (error); } -#if 0 -static void -hme_shutdown(void *arg) -{ - - hme_stop((struct hme_softc *)arg); -} -#endif - /* * Set up the logical address filter. */ ==== //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * * from: NetBSD: if_hme_pci.c,v 1.4 2001/08/27 22:18:49 augustss Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.3 2002/03/23 19:37:11 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.4 2003/01/09 00:45:10 tmm Exp $ */ /* @@ -77,11 +77,19 @@ static int hme_pci_probe(device_t); static int hme_pci_attach(device_t); +static int hme_pci_detach(device_t); +static int hme_pci_suspend(device_t); +static int hme_pci_resume(device_t); static device_method_t hme_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, hme_pci_probe), DEVMETHOD(device_attach, hme_pci_attach), + DEVMETHOD(device_detach, hme_pci_detach), + DEVMETHOD(device_suspend, hme_pci_suspend), + DEVMETHOD(device_resume, hme_pci_resume), + /* Can just use the suspend method here. */ + DEVMETHOD(device_shutdown, hme_pci_suspend), /* bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -182,6 +190,7 @@ if ((error = bus_setup_intr(dev, hsc->hsc_ires, INTR_TYPE_NET, hme_intr, sc, &hsc->hsc_ih)) != 0) { device_printf(dev, "couldn't establish interrupt\n"); + hme_detach(sc); goto fail_ires; } return (0); @@ -192,3 +201,37 @@ bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_srid, hsc->hsc_sres); return (ENXIO); } + +static int +hme_pci_detach(device_t dev) +{ + struct hme_pci_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_detach(sc); + + bus_teardown_intr(dev, hsc->hsc_ires, hsc->hsc_ih); + bus_release_resource(dev, SYS_RES_IRQ, hsc->hsc_irid, hsc->hsc_ires); + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_srid, hsc->hsc_sres); + return (0); +} + +static int +hme_pci_suspend(device_t dev) +{ + struct hme_pci_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_suspend(sc); + return (0); +} + +static int +hme_pci_resume(device_t dev) +{ + struct hme_pci_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_resume(sc); + return (0); +} ==== //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: if_hme_sbus.c,v 1.9 2001/11/13 06:58:17 lukem Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.2 2002/03/23 19:37:11 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.3 2003/01/09 00:45:10 tmm Exp $ */ /* @@ -92,11 +92,19 @@ static int hme_sbus_probe(device_t); static int hme_sbus_attach(device_t); +static int hme_sbus_detach(device_t); +static int hme_sbus_suspend(device_t); +static int hme_sbus_resume(device_t); static device_method_t hme_sbus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, hme_sbus_probe), DEVMETHOD(device_attach, hme_sbus_attach), + DEVMETHOD(device_detach, hme_sbus_detach), + DEVMETHOD(device_suspend, hme_sbus_suspend), + DEVMETHOD(device_resume, hme_sbus_resume), + /* Can just use the suspend method here. */ + DEVMETHOD(device_shutdown, hme_sbus_suspend), /* bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -249,6 +257,7 @@ if ((error = bus_setup_intr(dev, hsc->hsc_ires, INTR_TYPE_NET, hme_intr, sc, &hsc->hsc_ih)) != 0) { device_printf(dev, "couldn't establish interrupt\n"); + hme_detach(sc); goto fail_ires; } return (0); @@ -274,3 +283,47 @@ hsc->hsc_seb_res); return (ENXIO); } + +static int +hme_sbus_detach(device_t dev) +{ + struct hme_sbus_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_detach(sc); + + bus_teardown_intr(dev, hsc->hsc_ires, hsc->hsc_ih); + if (hsc->hsc_mif_res != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_mif_rid, + hsc->hsc_mif_res); + } + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_mac_rid, + hsc->hsc_mac_res); + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_erx_rid, + hsc->hsc_erx_res); + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_etx_rid, + hsc->hsc_etx_res); + bus_release_resource(dev, SYS_RES_MEMORY, hsc->hsc_seb_rid, + hsc->hsc_seb_res); + return (0); +} + +static int +hme_sbus_suspend(device_t dev) +{ + struct hme_sbus_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_suspend(sc); + return (0); +} + +static int +hme_sbus_resume(device_t dev) +{ + struct hme_sbus_softc *hsc = device_get_softc(dev); + struct hme_softc *sc = &hsc->hsc_hme; + + hme_resume(sc); + return (0); +} ==== //depot/projects/smpng/sys/dev/hme/if_hmevar.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: hmevar.h,v 1.5 2000/06/25 01:10:04 eeh Exp * - * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.3 2003/01/06 22:12:57 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.4 2003/01/09 00:45:10 tmm Exp $ */ #include @@ -150,6 +150,9 @@ extern devclass_t hme_devclass; int hme_config(struct hme_softc *); +void hme_detach(struct hme_softc *); +void hme_suspend(struct hme_softc *); +void hme_resume(struct hme_softc *); void hme_intr(void *); /* MII methods & callbacks */ ==== //depot/projects/smpng/sys/dev/mly/mly.c#12 (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/dev/mly/mly.c,v 1.17 2002/11/14 13:25:53 mux Exp $ + * $FreeBSD: src/sys/dev/mly/mly.c,v 1.18 2003/01/08 06:30:34 scottl Exp $ */ #include @@ -685,6 +685,9 @@ debug_called(1); + /* Remove the management device */ + destroy_dev(sc->mly_dev_t); + /* detach from CAM */ mly_cam_detach(sc); ==== //depot/projects/smpng/sys/dev/sab/sab.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. * - * $FreeBSD: src/sys/dev/sab/sab.c,v 1.8 2003/01/05 04:07:31 jake Exp $ + * $FreeBSD: src/sys/dev/sab/sab.c,v 1.9 2003/01/08 04:30:30 jake Exp $ */ /* @@ -446,12 +446,14 @@ case 0: /* port A */ sc->sc_pvr_dtr = SAB_PVR_DTR_A; sc->sc_pvr_dsr = SAB_PVR_DSR_A; - sc->sc_bh = sc->sc_parent->sc_bh + SAB_CHAN_A; + bus_space_subregion(sc->sc_bt, sc->sc_parent->sc_bh, + SAB_CHAN_A, SAB_CHANLEN, &sc->sc_bh); break; case 1: /* port B */ sc->sc_pvr_dtr = SAB_PVR_DTR_B; sc->sc_pvr_dsr = SAB_PVR_DSR_B; - sc->sc_bh = sc->sc_parent->sc_bh + SAB_CHAN_B; + bus_space_subregion(sc->sc_bt, sc->sc_parent->sc_bh, + SAB_CHAN_B, SAB_CHANLEN, &sc->sc_bh); break; default: return (ENXIO); ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.81 2003/01/01 18:48:51 schweikh Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.82 2003/01/08 06:24:25 mdodd Exp $"); /* board-specific include files */ #include @@ -158,6 +158,7 @@ #define MD_AD1848 0x91 #define MD_AD1845 0x92 #define MD_CS42XX 0xA1 +#define MD_CS423X 0xA2 #define MD_OPTI930 0xB0 #define MD_OPTI931 0xB1 #define MD_OPTI925 0xB2 @@ -1807,8 +1808,7 @@ mss = pcm_getdevinfo(dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 9 17:12:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9FD537B405; Thu, 9 Jan 2003 17:12:26 -0800 (PST) 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 741FA37B401 for ; Thu, 9 Jan 2003 17:12:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CACE43E4A for ; Thu, 9 Jan 2003 17:12:25 -0800 (PST) (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 h0A1COfh057957 for ; Thu, 9 Jan 2003 17:12:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0A1CNGN057954 for perforce@freebsd.org; Thu, 9 Jan 2003 17:12:23 -0800 (PST) Date: Thu, 9 Jan 2003 17:12:23 -0800 (PST) Message-Id: <200301100112.h0A1CNGN057954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23512 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23512 Change 23512 by marcel@marcel_vaio on 2003/01/09 17:12:21 IFC @23511 Affected files ... .. //depot/projects/ia64/etc/Makefile#20 integrate .. //depot/projects/ia64/etc/devd.conf#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#5 integrate .. //depot/projects/ia64/sbin/devd/devd-generic#3 delete .. //depot/projects/ia64/sbin/devd/devd.conf#4 delete .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#11 integrate .. //depot/projects/ia64/share/misc/pci_vendors#16 integrate .. //depot/projects/ia64/share/termcap/termcap.src#13 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#10 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#20 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#10 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/ia64/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/usbcdc.h#2 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#8 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#33 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#11 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#25 integrate .. //depot/projects/ia64/sys/modules/Makefile#33 integrate .. //depot/projects/ia64/sys/modules/hme/Makefile#1 branch .. //depot/projects/ia64/sys/modules/if_hme/Makefile#2 delete .. //depot/projects/ia64/sys/netinet/if_ether.c#12 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#21 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#8 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/ia64/sys/powerpc/ofw/ofw_pci.c#2 integrate .. //depot/projects/ia64/sys/powerpc/ofw/ofw_pcib_pci.c#1 branch .. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/ia64/sys/sparc64/include/ucontext.h#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#29 integrate .. //depot/projects/ia64/sys/ufs/ffs/fs.h#10 integrate .. //depot/projects/ia64/tools/tools/README#8 integrate .. //depot/projects/ia64/tools/tools/tinderbox/make.conf#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.sh#1 branch .. //depot/projects/ia64/tools/tools/whereintheworld/Makefile#1 branch .. //depot/projects/ia64/tools/tools/whereintheworld/whereintheworld.pl#1 branch .. //depot/projects/ia64/usr.bin/mail/head.c#4 integrate .. //depot/projects/ia64/usr.bin/mail/mail.1#5 integrate .. //depot/projects/ia64/usr.bin/mail/misc/mail.tildehelp#3 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.8#9 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#14 integrate Differences ... ==== //depot/projects/ia64/etc/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.301 2002/12/17 21:23:36 green Exp $ +# $FreeBSD: src/etc/Makefile,v 1.302 2003/01/09 04:05:05 imp Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -7,7 +7,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout \ - dhclient.conf fbtab ftpusers gettytab group \ + devd.conf dhclient.conf fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig networks newsyslog.conf \ ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#5 (text+ko) ==== @@ -1,9 +1,9 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.6 2002/12/07 22:32:30 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.7 2003/01/09 12:11:20 ue Exp $ 2002 + 2003 The &os; Release Engineering Team ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#5 (text+ko) ==== @@ -8,8 +8,8 @@ (If we didn't do this, then the file with the datestamp might not be the one that received the last change in the document.) - $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.sgml,v 1.9 2002/10/12 18:02:21 ue Exp $ - basiert auf: 1.9 + $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.sgml,v 1.10 2003/01/09 12:08:02 ue Exp $ + basiert auf: 1.10 --> - $FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/article.sgml,v 1.4 2002/10/12 19:00:27 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/article.sgml,v 1.5 2003/01/09 12:11:20 ue Exp $ 2000 2001 2002 + 2003 The FreeBSD Documentation Project 2001 2002 + 2003 The FreeBSD German Documentation Project ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml#2 (text+ko) ==== @@ -1,8 +1,7 @@ @@ -17,6 +16,8 @@ 2002 + 2003 + The FreeBSD Documentation Project @@ -24,6 +25,8 @@ 2002 + 2003 + The FreeBSD German Documentation Project ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml#2 (text+ko) ==== @@ -1,8 +1,7 @@ @@ -16,11 +15,13 @@ 2000 2001 2002 + 2003 The FreeBSD Documentation Project 2002 + 2003 The FreeBSD German Documentation Project ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#8 (text+ko) ==== @@ -1,8 +1,8 @@ Das &os; Projekt - $FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/article.sgml,v 1.8 2002/12/07 22:32:31 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/article.sgml,v 1.9 2003/01/09 12:11:20 ue Exp $ 2000 @@ -33,6 +33,8 @@ 2002 + 2003 + The FreeBSD Documentation Project @@ -40,6 +42,8 @@ 2002 + 2003 + The FreeBSD German Documentation Project ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Systems @@ -18,7 +18,6 @@ The following systems are fully supported by &os;. - Blade 100 @@ -87,7 +86,6 @@ Ultra 80 - @@ -96,7 +94,6 @@ The following systems are partially supported by &os;. In particular the onboard scsi controller in sbus systems is not supported. - Enterprise 4500 @@ -108,7 +105,6 @@ Ultra 2 - @@ -119,7 +115,6 @@ system design that makes &os; unstable, or due to lack of support for sufficient onboard devices to make &os; generally useful. - All systems containing UltraSPARC III processor(s). @@ -131,6 +126,5 @@ Ultra 1 - ==== //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.28 2002/12/14 13:54:57 des Exp $ +# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.29 2003/01/09 08:36:05 des Exp $ # PROG= sshd @@ -41,8 +41,7 @@ LDADD+= -lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM} DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} -.if defined(OPENSSH_USE_POSIX_THREADS) && \ - !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64 && ${MACHINE_ARCH} != sparc64 +.if defined(OPENSSH_USE_POSIX_THREADS) && !defined(NOLIBC_R) CFLAGS+=-DUSE_POSIX_THREADS LDADD+= -lc_r DPADD+= ${LIBC_R} ==== //depot/projects/ia64/share/misc/pci_vendors#16 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.22 2002/10/30 13:35:48 sheldonh Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.23 2003/01/09 15:38:06 sheldonh Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -136,6 +136,7 @@ 0702 Yellowfin G-NIC Gigabit Ethernet Controller 0901 61C102 USB Controller 1000 63C815 Fast SCSI Controller + 1001 53C895 Symbios Ultra2 SCSI controller 1001 Kolter Electronic - Germany 0010 PCI1616 Measurement card with 32 digital I/O lines 0011 ispLSI1032E OPTO-PCI, 16 IN / 16 OUT 24 VDC @@ -147,8 +148,12 @@ 0017 ispLSI1032E PROTO-3 PCI, digital I/O with chipselect 0020 ispLSI1032E Universal digital I/O PCI-Interface 1002 ATI Technologies + 4144 R300 Radeon 9700/9500 Series + 4147 ATI Fire GL Z1 4P Video Accelerator 4158 Mach32 (68800AX) - 4242 Radeon 8500 DV Edition + 4164 R300 Radeon 9700/9500 Series - Secondary + 4167 ATI Fire GL Z1 4P SECONDARY Video + 4242 R200AIW All-In-Wonder 8500DV 4243 Lucent OHCI IEEE1394 Host Controller 4336 Radeon Mobility U1 4354 Mach64 CT (215CT222) @@ -174,8 +179,8 @@ 4758 210888GX Mach 64 GX (WinTurbo) 4759 Rage 3D IIC 475A Rage 3D IIC AGP (PQFP Package) - 4966 Radeon 9000 (RV250) - 496E Radeon RV250 Secondary + 4966 RV250 Radeon 9000/9000 Pro + 496E RV250 Radeon 9000/9000 Pro - Secondary 4C42 Rage 3D LT Pro AGP 133MHz (BGA-312 Package) 4C44 Rage 3D LT Pro AGP 66MHz (BGA-312 Package) 4C45 Rage Mobility M3 AGP @@ -197,8 +202,12 @@ 4C66 Radeon Mobility M9 4D46 Rage Mobility 128 AGP 4x 4D4C Rage Mobility 128 AGP - 4E44 R300 Radeon 9700 Pro - 4E64 Radeon 9700 Series - Secondary + 4E44 R300 Radeon 9700/9500 Series + 4E45 R300 Radeon 9700/9500 Series + 4E47 ATI Fire GL X1/Z1 Video Accelerator + 4E64 R300 Radeon 9700/9500 Series - Secondary + 4E65 R300 Radeon 9700/9500 Series - Secondary + 4E67 ATI Fire GL X1/Z1 SECONDARY Video 5041 Rage 128 Pro PA PCI 5042 Rage 128 Pro PB AGP 2x 5043 Rage 128 Pro PC AGP 4x @@ -223,7 +232,7 @@ 5056 Rage 128 Pro PV PCI Rage 128 Pro PV PCI (TMDS) 5057 Rage 128 Pro PW AGP Rage 128 Pro PW AGP 2x (TMDS) 5058 Rage 128 Pro PX AGP Rage 128 Pro PX AGP 4x (TMDS) - 5144 Radeon 7200 / Radeon + 5144 Radeon 7200 QD SDR/DDR 5145 Radeon QE 5146 Radeon QF 5147 Radeon QG @@ -231,7 +240,7 @@ 5149 Radeon R200 QI 514A Radeon R200 QJ 514B Radeon R200 QK - 514C Radeon QL Radeon 8500 + 514C R200 Radeon 8500 / 8500LE 514E Radeon R200 QM 514F Radeon R200 QN 5157 RV200 Radeon 7500 @@ -310,11 +319,11 @@ 0011 NS87560 National PCI System I/O 0012 USB Controller 001B LM4560 Advanced PCI Audio Accelerator - 0020 DP83815 10/100 Fast Ethernet Adapter (MacPhyter) + 0020 DP83815/16 MacPhyter 10/100 Mb/s Ethernet MAC & PHY 0021 PC87200 PCI to ISA Bridge 0022 DP83820/1 10/100/1000 Gigabit Ethernet Adapter 0500 SCx200 Bridge - 0501 CSx200 SMI + 0501 SCx200 SMI 0502 SCx200 IDE 0503 SCx200 Audio 0504 SCx200 Video @@ -443,6 +452,7 @@ 0170 RC1000 Rasterizer/IBM GT1000 Geometr 01A7 IBM 133 PCI-X Bridge R1.1 01BD ServeRAID 4/5 Morpheus SCSI RAID Controller + 01EF 440GP PLB to PCI-X Bridge 0302 PCI-X Host Bridge FFFF MPIC 2 Interrupt Controller 1015 LSI Logic Corp of Canada @@ -530,7 +540,7 @@ 2001 4DWave(NX) PCI Audio 8400 CyberBlade i7 8420 CyberBlade i7 AGP - 8500 CyberBlade i1 AGP 51 + 8500 CyberBlade i1 AGP 51 (77?) 8520 CyberBlade i1 AGP 8620 CyberBlade-A i1 AGP 8820 CyberBlade XP Ai1 @@ -787,9 +797,10 @@ 6325 SiS650/651/740 GUI 2D/3D Accelerator 6326 SiS 86C326 AGP/PCI Graphics & Video Accelerator 7001 SiS5597/8 Universal Serial Bus Controller + 7002 SiS7002 USB 2.0 Enhanced Host Controller 7005 SiS551/552 Memory Stick Controller 7007 SiS OHCI Compliant FireWire Controller - 7012 SiS7012 Sound Codec + 7012 SiS7012 PCI Audio Accelerator 7013 SiS7013 56k Modem 7015 SiS550/1/2 Software Audio 7016 SiS7016 10/100 Ethernet Adapter @@ -1042,6 +1053,7 @@ 0D30 PDC20265 FastTrak100 Lite EIDE Controller 0D38 PDC20263 FastTrak66 EIDE Controller 1275 PDC20275 FastTrack TX EIDE Controller + 3376 PDC20376 FastTrak 376 Controller 4D30 PDC20267 FastTrack100 EIDE Controller 4D33 PDC20246 FastTrak Ultra ATA RAID controller 4D38 PDC20262 FastTrak66 EIDE Controller @@ -1247,6 +1259,7 @@ 0613 Host Bridge (??) 1084 Parador 1085 Tulip Computers Int'l BV + 0001 UsbDgn Datalaster Interface for OBD automotive 1086 J. Bond Computer Systems 1087 Cache Computer 1088 Microcomputer Systems (M) Son @@ -1383,7 +1396,7 @@ 036C Bt879(??) Video Capture 036E Bt878 MediaStream Controller 036F Bt879 Video Capture - 0370 Bt880 Video Capture + 0370 Bt880 Video Capture (10 bit High qualtiy cap) 0878 Bt878 Video Capture (Audio Section) 0879 Bt879 Video Capture (Audio Section) 0880 Bt880 Video Capture (Audio Section) @@ -1587,6 +1600,7 @@ 1541 ALI M1541 Aladdin V/V+ AGP System Controller 1543 ALI M1543 PCI South Bridge Aladdin IV+/V 1561 ALI M1561 Aladdin 7 + 1563 M1563 South Bridge with Hypertransport Support 1621 ALI M1621 Aladdin Pro II AGP System Controller 1631 ALI M1631 Aladdin Pro III AGP System Controller 1632 ALI M1632 Aladdin i1 CyberBlade AGP System Controller @@ -1597,6 +1611,9 @@ 1651 ALI M1651 Aladdin Pro V AGP System Controller 1661 ALI M1661 AGP System Controller 1667 ALI M1667 AGP System Controller + 1671 M1671 Super P4 Nouth Bridge + 1681 M1681 P4 Nouth Bridge with HyperTransport + 1687 M1687 K8 North Bridge with HyperTransport 3141 ALI M3141 GUI Accelerator 2Mb 3143 ALI M3143 GUI Accelerator 2Mb + DAC 3145 ALI M3145 GUI Accelerator 2Mb @@ -1619,6 +1636,9 @@ 5243 ALI M1541 PCI to AGP Bridge 5244 Floppy Disk Controller 5247 ALI M1621 PCI to AGP Bridge + 5249 M5249 HyperTransport to PCI Bridge + 5251 M5251 IEEE P1394 OpenHCI 1.0 Controller + 5253 M5253 IEEE P1394 OpenHCI 1.0 Controller 5427 ALI PCI to AGP Bridge 5450 Agere Systems AC'97 Modem 5451 ALI M5451 PCI AC-Link Controller Audio Device @@ -1740,10 +1760,10 @@ 0101 NV10 GeForce DDR 0102 GeForce 256 Ultra [NV10] 0103 Quadro (GeForce 256 GL) [NV10GL] - 0110 NV11 GeForce 2 MX / MX 400 + 0110 NV11 GeForce2 MX / MX 400 0111 GeForce2 MX 100/200 (DDR) [NV11DDR] 0112 GeForce2 MX Ultra [NV11] - 0113 NV11 GL Quadro2 MXR/EX/Go + 0113 NV11 GL Quadro2 MXR / EX / Go 0150 GeForce2 GTS/GeForce2 PRO [NV15] 0151 GeForce2 Ti (DDR) [NV15DDR] 0152 GeForce2 Ultra (BladeRunner) [NV15BR] @@ -1755,7 +1775,7 @@ 0174 NV17M GeForce4 440 Go 0175 NV17M GeForce4 420 Go 0176 NV17M GeForce4 420 Go 32M - 0178 Quadro4 500XGL [NV17GL.1] + 0178 NV17GL  Quadro4 500/550 XGL 0179 NV17M GeForce4 440 Go 64M 017A Quadro4 200/400NVS [[NV17GL.2] 017B Quadro4 550XGL [[NV17GL.3] @@ -1921,6 +1941,7 @@ 0014 GUI Accelerator 0015 GUI Accelerator 10FB Thesys Microelectronic's + 186F TH6255 10FC I-O Data Device Inc. 10FD Soyo Technology Corp. Ltd. 10FE Fast Electronic GmbH @@ -1947,7 +1968,7 @@ 8938 EV1938 Sound 1103 HighPoint Technologies Inc. 0003 HPT343/5/6,HPT363 UDMA EIDE Controller - 0004 HPT366/368/370/372 UDMA66/100 EIDE Controller + 0004 HPT3xx UDMA66/100/133 EIDE Controller 0005 HPT372A UDMA/ATA133 RAID Controller 0006 HPT302 UDMA/ATA133 EIDE Controller 0007 HPT371 UDMA/ATA133 EIDE Controller @@ -1990,13 +2011,14 @@ 3040 VT83C572, VT86C586/A/B Power Management Controller 3043 VT86C100A Rhine 10/100 Fast Ethernet Adapter 3044 VT6306 VIA Fire II IEEE-1394 OHCI Link Layer Controller - 3050 VT82C596/A/B Power Management Controller + 3050 VT82C596/596A/596 Power Management and SMBus Controller 3051 Power Management Controller + 3053 VT6105M Rhine III Management Adapter 3057 VT82C686A/B ACPI Power Management Controller 3058 VT82C686/A/B AC'97 Audio Codec - 3059 VT8233 AC'97 Enhanced Audio Controller + 3059 VT8233/33A AC97 Enhanced Audio Controller 3065 VT6102 Rhine II PCI Fast Ethernet Controller - 3068 VT82C686/A/B Modem Codec + 3068 VT82C686/686A/686B AC97 Modem Codec 3074 VT8233 PCI to ISA Bridge 3086 VT82C686 Power Management Controller (??) 3091 VT8633 Apollo Pro 266 CPU to PCI Bridge @@ -2045,6 +2067,7 @@ 8605 VT8605 ProSavage PM133 CPU to AGP Bridge 8691 VT82C691/693A/694X Apollo Pro/133/133A PCI to PCI Bridge 8693 VT82C693 Apollo Pro Plus PCI to PCI Bridge + 9398 VT8601 2D/3D Graphics Accelerator B091 VT8633 Apollo Pro 266 CPU to AGP Controller B099 VT8366/A,VT8367 Apollo KT266/A,KT333 PCI to AGP Bridge B101 VT8653 Apollo Pro 266T CPU to AGP Controller @@ -2096,6 +2119,7 @@ 6120 SZB6120 Multimedia Adapter 110B CHROMATIC Research Inc / Xenon Microsystems 0001 Mpact Media Processor + 0002 GM90C7110VX MPACT DVD decoder. 0004 Mpact2 3DVD Media Processor 110C Mini-Max Technology Inc. 110D ZNYX Corporation @@ -2168,7 +2192,7 @@ 0124 GDT6111RP2/6511RP2 0125 GDT6127RP2/6527RP2 0136 GDT 6113RS/6513RS - 0137 GDT 6123RS/6523RS + 0137 GDT 6x23RS Disk Array Controller 0138 GDT 6118RS/6518RS/6618RS 0139 GDT 6128RS/6528RS/6628RS 013A GDT 6538RS/6638RS @@ -2431,16 +2455,18 @@ 1165 Imagraph Corporation 0001 Motion JPEG Recorder/Player with Audio 1166 Reliance Computer Corp./ServerWorks - 0005 NB6536 (CNB20HE) PCI to PCI Bridge, bus/dev/func 0/0/1 - 0006 NB6536 (CNB20HE) Host Bridge, function 2 and function 3 - 0007 NB6635 (CNB20-LE) CPU to PCI Bridge - 0008 NB6536 (CNB20HE) Hostbridge & MCH, bus/dev/func 0/0/0 - 0009 NB6536 (CNB20HE) AGP interface + 0005 NB6536 (CNB20-LE) PCI to PCI Bridge, bus/dev/func 0/0/1 + 0006 NB6536 (CNB20-HE) Host Bridge, function 2 and function 3 + 0007 NB6635 (CNB20-LE/HE) CPU to PCI Bridge + 0008 NB6536 (CNB20-HE) Hostbridge & MCH, bus/dev/func 0/0/0 + 0009 NB6536 (CNB20-LE) AGP interface 0010 CIOB30 0011 CMIC-HE 0012 CMIC-LE - 0013 CPU to PCI Bridge & MCH - 0015 CPU to PCI Bridge & MCH + 0013 CNB20-HE Hostbridge and MCH + 0014 CNB20-HE Host Bridge + 0015 CMIC-GC Hostbridge and MCH + 0016 CMIC-GC Host Bridge 0017 CMIC-SL 0101 CIOB-X2 0200 OSB4 PCI to ISA Bridge @@ -2526,6 +2552,7 @@ 1340 DFE-690TXD CardBus PC Card 1561 DRP-32TXD CardBus PC Card 4000 DL2000 Gigabit Ethernet Adapter + 4001 DFE-650TX D Link Fast Ethernet PCMCIA Card 1187 Advanced Technology Laboratories 1188 Shima Seiki Manufacturing Ltd. 1189 Matsushita Electronics Co @@ -2567,6 +2594,8 @@ 0005 ATP850UF UltraDMA33 EIDE Controller (AEC6210UF) 0006 ATP860A UltraDMA66 EIDE Controller, NO-BIOS (AEC6260) 0007 ATP860R UltraDMA66 EIDE Controller (AEC6260) + 0008 ATP865 + 0009 ATP865 8001 ATP8600 SCSI-2 RAID (Cache??) Host Adapter (AEC6820U) 8002 ATP850S SCSI-2 Host Adapter (AEC6710L/F) 8010 ATP870 Ultra Wide SCSI Contoller (AEC6712UW) @@ -2739,7 +2768,8 @@ 01F7 VxP524 PCI Video Processor 11D2 Intercom Inc. 11D3 Trancell Systems Inc -11D4 Analog Devices +11D4 Analog Devices, Inc. + 1535 ADSP-21535 Blackfin DSP PCI Bus Interface 1805 Motorola SM56 PCI Speakerphone Modem 1807 56k Winmodem Chip 1889 AD1889 Sound Chip @@ -3214,6 +3244,7 @@ 12BF Fujifilm Microdevices 12C0 Infimed 12C1 GMM Research Corp. + 9080 Sync4hs/CCP/PCI/MP Communications Processor 12C2 Mentec Ltd. 12C3 Holtek Microelectronics Inc. 0058 HT80232 LAN Adapter (NE2000-compatible) @@ -3237,6 +3268,7 @@ 0086 THR2 Multi-scale Thresholder 12C6 Mitani Corp. 12C7 Dialogic Corp. + 0689 D/600JCT-2E1 Dialogic 2E1 - JCT series 12C8 G Force Co. Ltd. 12C9 Gigi Operations 12CA Integrated Computing Engines, Inc. @@ -3632,7 +3664,7 @@ 13A8 Exar Corp. 0154 XR17C154 PCI Bus Quad UART 0158 XR17C158 PCI Bus Octal UART -13A9 Siemens Medical Systems Ultrasound Group +13A9 Siemens Medical Solutions 13AA Nortel Networks - BWA Division 13AB Arcom Control Systems Ltd 13AC Motion Media Technology Ltd @@ -3783,16 +3815,18 @@ 1413 Addonics 1414 Microsoft Corp 1415 Oxford Semiconductor Ltd - 8401 OX9162 PCI Bridge + 8401 OX9162 PCI Interface to local bus 8403 OX12PCI840 PCI Parallel Port - 9500 PCI Function - 9501 OX16PCI954 PCI UARTs + 9500 OX16PCI954 Quad UART (disabled) + 9501 OX16PCI954 Quad UART 950A OX16PCI954 Dual PCI UART - 950B OXCB950 CardBus UART - 9510 PCI Function - 9511 OX16PCI954 PCI Bridge - 9512 OX16PCI954 32-bit PCI Bridge + 950B OXCB950 Integrated High Performance UART + 9510 OX16PCI954 PCI Interface (disabled) + 9511 OX9160 PCI Interface to 8-bit local bus + 9512 OX16PCI954 PCI Interface to 32-bit bus 9513 OX16PCI954 PCI Parallel Port + 9521 OX12PCI952 Dual UART + 9523 OX12PCI952 Integrated Parallel Port 1416 Multiwave Innovation Pte Ltd 1417 Convergenet Technologies Inc 1418 Kyushu Electronics Systems Inc @@ -4668,6 +4702,9 @@ 1658 Med Associates Inc. 1659 Shiba Denshi Systems Inc. 165A Epix Inc. + C100 PIXCI CL1 PCI camera link video capture board + D200 PIXCI D2X PCI digital video capture board + D300 PIXCI D3X PCI digital video capture board 165B Real-Time Digital Inc. 165C Gidel Ltd. 165D Hsing Tech. Enterprise Co. Ltd. @@ -4760,6 +4797,7 @@ 16F0 TLA Inc. 16F1 Adicti Corp. 16F2 Bosch Rexroth AG +16F3 Jetway Information Co., Ltd 16F4 VWEB Corp 16F6 VideoTele.com Inc. 16F7 Advanced Rendering Technology Ltd @@ -4866,6 +4904,7 @@ 1782 Lightsand Communications Inc 1783 Trebia Networks 1784 Lockheed Martin Systems Integration +1789 Ennyah Technologies Corp 178A Sandcraft Inc 178D DesignTech Co Ltd 178E Envara @@ -5057,6 +5096,12 @@ 1854 LG Electronics 1855 Cascade Semiconductor Solutions Inc 1856 Silicon Logic Engineering Inc +1860 Primagraphics Ltd. +1888 1 Prolink Computer Inc. + 2503 Bt881 Video Capture (10 bit High qualtiy cap) + 2504 Bt878 Video Capture + 3503 nVidia NV28 VGA Geforce4 MX440 + 3505 nVidia NV28 VGA Geforce4 Ti4200 1898 DIC INFORMATION TECHNOLOGY ,LTD 2001 DVB Receiver Card 1978 HARPO sp. z o.o. @@ -5178,6 +5223,7 @@ 4010 Wide SCSI Host Adapter 4C48 Lung Hwa Electronics 4C53 SBS-OR Industrial Computers + 0000 PLUSTEST Diagnostics Device 5000 NV5000 Ethernet Adapter 4CA1 Seanix Technology Inc 4CCC Computer Conversions Corp @@ -5189,6 +5235,7 @@ 1001 PCI Radio 5053 TBS/Voyetra Technologies 2010 Daytona Audio Adapter +5112 Sigmatek GmbH & CoKG 5136 S S Technologies 5143 Qualcomm Inc. 5145 Ensoniq (Old ID) @@ -5253,7 +5300,7 @@ 8A21 86C390 Savage3D/MV 8A22 86C394-397 Savage 4 8A23 86C394-397 Savage 4 - 8A25 Savege4 ProSavage PM133 + 8A25 Savage4 ProSavage PM133 8A26 86C395B ProSavage 8C00 85C260 ViRGE/M3 (ViRGE/MX) 8C01 86C260 ViRGE/M5 (ViRGE/MX) @@ -5357,6 +5404,14 @@ 0514 E8870IO Hub Interface Port 4 0515 E8870IO Server I/O Hub (SIOH) 0516 E8870IO Reliabilty, Availability and Serviceability (RAS) + 0530 E8870SP Scalability Port + 0531 E8870SP Scalability Port + 0532 E8870SP Scalability Port + 0533 E8870SP Scalability Port + 0534 E8870SP Scalability Port + 0535 E8870SP Scalability Port + 0536 E8870SP Scalability Port Switch Global Registers + 0537 E8870SP Interleave Configuration Registers 0600 Storage RAID Controller 0960 80960RP i960 RP Microprocessor/Bridge 0962 80960RM/RN i960RM/RN Microprocessor/Bridge @@ -5390,7 +5445,7 @@ 103C 82801DB LAN Controller with 82562EM/EX (CNR) PHY 103D 82801DB (ICH4) PRO/100 VE Network Connection 103E 82801DB (ICH4) PRO/100 VM Network Connection - 1040 536EP V.92 PCI Modem + 1040 536EP V.92 PCI (DSP) Data Fax Modem 1042 PRO/Wireless 2011 LAN PCI Card 1059 82551QM PRO/100 M Mobile Connection 1100 82815 815/E (Solano) Host to I/O Hub Bridge with 100MHz DRAM Controller @@ -5520,14 +5575,19 @@ 2539 82860 (Quad Processor mode) 2540 E7500 System Controller (MCH, Hub Interface A) 2541 E7500 System Controller (MCH, Hub Interface A) Error Reporter - 2543 E7500 HI_B Virtual PCI-to-PCI Bridge - 2544 E7500 HI_B PCI-to-PCI Bridge Error Reporting - 2545 E7500 HI_C Virtual PCI-to-PCI Bridge - 2546 E7500 HI_C PCI-to-PCI Bridge Error Reporting - 2547 E7500 HI_D Virtual PCI-to-PCI Bridge - 2548 E7500 HI_D PCI-to-PCI Bridge Error Reporting - 2550 7505 Dual-CPU to Host bridge, pci function 0 - 2552 7505 Dual-CPU to Host bridge, pci function 1 + 2543 E7500/E7501 HI_B Virtual PCI-to-PCI Bridge + 2544 E7500/E7501 HI_B PCI-to-PCI Bridge Error Reporting + 2545 E7500/E7501 HI_C Virtual PCI-to-PCI Bridge + 2546 E7500/E7501 HI_C PCI-to-PCI Bridge Error Reporting + 2547 E7500/E7501 HI_D Virtual PCI-to-PCI Bridge + 2548 E7500/E7501 HI_D PCI-to-PCI Bridge Error Reporting + 254C E7501 Host Controller + 2550 E7505 Host Controller + 2551 E7205/E7505 Host RAS Controller + 2552 E7205/E7505 PCI-to-AGP Bridge + 2553 E7505 Hub Interface_B PCI-to-PCI Bridge + 2554 E7505 Hub I/F_B PCI-to-PCI Bridge Error Report + 255D E7205 Host Controller 2560 82845G/GL/GV/GE/PE DRAM Controller / Host-Hub I/F Bridge 2561 82845G/GL/GV/GE/PE Brookdale Host-to-AGP Bridge 2562 82845G/GL/GV/GE/PE Integrated Graphics Device @@ -5725,7 +5785,7 @@ 9412 Holtek 6565 HT6565 PCI EIDE Controller 9699 Omni Media Technology Inc. -9710 Netmos +9710 NetMos Techology 9705 Nm9705 Parallel Port Adapter 9715 Nm9715 PCI Dual 1284 Printer Ports 9735 Nm9735 Dual UART @@ -5733,6 +5793,8 @@ 9755 Nm9755 PCI Bridge with 1284 Parallel Port 9805 Nm9805 PCI + 1284 Printer Port 9815 Nm9815 Parallel/Serial Port Adapter + 9820 Nm9820 Single PCI UART + 9825 Nm9825 Single PCI UART 9835 Nm9835 PCI + Dual UART and 1284 Printer Port 9845 Nm9845 Parallel/Serial Port Adapter 9855 Nm9855 Parallel/Serial Port Adapter @@ -5780,6 +5842,7 @@ CCCC Catapult Communications CDDD Tyzx Inc. 0101 DeepSea 1 Board + 0200 DeepSea 1 High speed stereo correlation chip D4D4 DY4 Systems Inc. 0601 PCI Mezzanine Card D531 I+ME ACTIA GmBH @@ -5819,6 +5882,7 @@ A0A1 Stingray 64 ARK2000MT 64-bit GUI W/DCI Playback A0A9 ARK2000MI Quadro645 GUI Accelerator A0B1 ARK2000MI+ GUI Accelerator +F1D0 AJA Video F5F5 F5 Networks Inc. FA57 Fast Search & Transfer ASA 0001 PMC Pattern Matching Chip ==== //depot/projects/ia64/share/termcap/termcap.src#13 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.133 2002/12/19 01:17:07 davidxu Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.134 2003/01/09 19:52:01 trhodes Exp $ # Termcap source file # John Kunze, Berkeley @@ -4472,7 +4472,7 @@ :pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=kons25jx: # Termcap for Top Gun Telnet and SSH on the Palm Pilot. -# http://www.isaac.cs.berkeley.edu/pilot/tgtelnet.html +# http://www.ai/~iang/TGssh/ pilot|tgtelnet:am:xn:bs:co#39:li#16:cl=\Ec:cm=\Em%+ %+ :ho=\Em :nw=\Em~ :\ :so=\Eb:se=\EB:bl=^g:cr=^m:do=^j:le=^h:kP=^k:kN=^l: ==== //depot/projects/ia64/sys/conf/files.powerpc#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.20 2002/09/19 05:11:15 grehan Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.21 2003/01/09 12:04:18 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -68,6 +68,7 @@ powerpc/powerpc/mp_machdep.c optional smp powerpc/ofw/ofw_pci.c optional pci +powerpc/ofw/ofw_pcib_pci.c optional pci powerpc/powermac/uninorth.c optional powermac pci powerpc/powermac/macio.c optional powermac pci ==== //depot/projects/ia64/sys/dev/amr/amr.c#11 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amr.c,v 1.38 2002/12/30 21:18:06 schweikh Exp $ + * $FreeBSD: src/sys/dev/amr/amr.c,v 1.39 2003/01/09 21:02:28 emoore Exp $ */ /* @@ -977,7 +977,7 @@ { struct amr_softc *sc = ac->ac_sc; int s; - int error; + int error,count; debug_called(2); @@ -986,8 +986,16 @@ s = splbio(); + count=0; + while (sc->amr_busyslots){ + tsleep(sc, PRIBIO | PCATCH, "amrpoll", hz); + if(count++>10) { + break; + } + } + if(sc->amr_busyslots) { - device_printf(sc->amr_dev, "adapter is busy"); + device_printf(sc->amr_dev, "adapter is busy\n"); splx(s); amr_unmapcmd(ac); ac->ac_status=0; @@ -1002,6 +1010,7 @@ sc->amr_mailbox->mb_status = 0xFF; sc->amr_mailbox->mb_poll = 0; sc->amr_mailbox->mb_ack = 0; + sc->amr_mailbox->mb_busy = 1; AMR_QPUT_IDB(sc, sc->amr_mailboxphys | AMR_QIDB_SUBMIT); @@ -1015,6 +1024,7 @@ /* acknowledge that we have the commands */ AMR_QPUT_IDB(sc, sc->amr_mailboxphys | AMR_QIDB_ACK); + while(AMR_QGET_IDB(sc) & AMR_QIDB_ACK); splx(s); @@ -1403,6 +1413,10 @@ } else if (ac->ac_flags & AMR_CMD_SLEEP) { wakeup(ac); } + + if(!sc->amr_busyslots) { + wakeup(sc); + } } } ==== //depot/projects/ia64/sys/dev/ata/ata-cbus.c#3 (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-cbus.c,v 1.2 2002/12/17 16:26:22 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.3 2003/01/09 14:00:07 sos Exp $ */ #include "opt_ata.h" @@ -60,6 +60,10 @@ int rid; u_long tmp; + /* dont probe PnP devices */ + if (isa_get_vendorid(dev)) + return (ENXIO); + /* allocate the ioport range */ rid = ATA_IOADDR_RID; io = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, ata_pc98_ports, ==== //depot/projects/ia64/sys/dev/ata/ata-dma.c#20 (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-dma.c,v 1.108 2003/01/08 16:51:41 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.109 2003/01/09 13:54:07 sos Exp $ */ #include @@ -1337,7 +1337,7 @@ } if (udmamode >= 2) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, - ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY); + ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) ata_prtdev(atadev, "%s setting up UDMA2 mode on Acard chip\n", (error) ? "failed" : "success"); ==== //depot/projects/ia64/sys/dev/firewire/firewire.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.17 2003/01/07 04:26:45 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.18 2003/01/09 10:25:07 simokawa Exp $ * */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 9 22:51:26 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4296A37B405; Thu, 9 Jan 2003 22:51:25 -0800 (PST) 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 E69F637B401 for ; Thu, 9 Jan 2003 22:51:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 899C043F65 for ; Thu, 9 Jan 2003 22:51:24 -0800 (PST) (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 h0A6pOfh079910 for ; Thu, 9 Jan 2003 22:51:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0A6pN6e079895 for perforce@freebsd.org; Thu, 9 Jan 2003 22:51:23 -0800 (PST) Date: Thu, 9 Jan 2003 22:51:23 -0800 (PST) Message-Id: <200301100651.h0A6pN6e079895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23525 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23525 Change 23525 by peter@peter_overcee on 2003/01/09 22:50:57 pccardd and friends are mostly i386 oldcard specific. Dont waste time compiling them here. Affected files ... .. //depot/projects/ia64/usr.sbin/Makefile#29 edit Differences ... ==== //depot/projects/ia64/usr.sbin/Makefile#29 (text+ko) ==== @@ -63,7 +63,6 @@ ngctl \ ntp \ nghook \ - pccard \ pciconf \ periodic \ pkg_install \ @@ -174,6 +173,7 @@ kgzip \ lptcontrol \ mptable \ + pccard \ pcvt \ pnpinfo \ sgsc \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jan 11 11:16:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D15437B405; Sat, 11 Jan 2003 11:15:49 -0800 (PST) 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 28C8B37B401 for ; Sat, 11 Jan 2003 11:15:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 303D943F43 for ; Sat, 11 Jan 2003 11:15:47 -0800 (PST) (envelope-from tzukanov@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 h0BJFlfh061104 for ; Sat, 11 Jan 2003 11:15:47 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0BJFbTV061101 for perforce@freebsd.org; Sat, 11 Jan 2003 11:15:37 -0800 (PST) Date: Sat, 11 Jan 2003 11:15:37 -0800 (PST) Message-Id: <200301111915.h0BJFbTV061101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 23589 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23589 Change 23589 by tzukanov@tzukanov_antares on 2003/01/11 11:15:03 IFC. Affected files ... .. //depot/projects/s390/Makefile#5 integrate .. //depot/projects/s390/Makefile.inc1#7 integrate .. //depot/projects/s390/UPDATING#5 integrate .. //depot/projects/s390/bin/chio/chio.1#2 integrate .. //depot/projects/s390/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/s390/bin/csh/USD.doc/csh.g#3 integrate .. //depot/projects/s390/bin/df/df.c#4 integrate .. //depot/projects/s390/bin/ed/io.c#2 integrate .. //depot/projects/s390/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/s390/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/s390/bin/pax/ar_io.c#3 integrate .. //depot/projects/s390/bin/pax/buf_subs.c#3 integrate .. //depot/projects/s390/bin/pax/cache.c#2 integrate .. //depot/projects/s390/bin/pax/cpio.c#3 integrate .. //depot/projects/s390/bin/pax/ftree.c#3 integrate .. //depot/projects/s390/bin/pax/options.c#3 integrate .. //depot/projects/s390/bin/pax/pat_rep.c#3 integrate .. //depot/projects/s390/bin/pax/pax.1#3 integrate .. //depot/projects/s390/bin/pax/pax.h#3 integrate .. //depot/projects/s390/bin/pax/sel_subs.c#2 integrate .. //depot/projects/s390/bin/pax/tables.c#2 integrate .. //depot/projects/s390/bin/ps/ps.1#4 integrate .. //depot/projects/s390/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/s390/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/s390/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/s390/bin/sh/bltin/echo.c#2 integrate .. //depot/projects/s390/bin/sh/builtins.def#3 integrate .. //depot/projects/s390/bin/sh/expand.c#3 integrate .. //depot/projects/s390/bin/sh/expand.h#2 integrate .. //depot/projects/s390/bin/sh/sh.1#4 integrate .. //depot/projects/s390/contrib/com_err/getarg.c#2 integrate .. //depot/projects/s390/contrib/diff/prepend_args.c#2 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/s390/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/s390/contrib/lukemftpd/libnetbsd/strsuftoll.c#1 branch .. //depot/projects/s390/contrib/lukemftpd/src/Makefile#1 branch .. //depot/projects/s390/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpusers.5#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/s390/contrib/openpam/CREDITS#3 integrate .. //depot/projects/s390/contrib/openpam/HISTORY#3 integrate .. //depot/projects/s390/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_ttyconv.c#5 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/s390/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/s390/contrib/tcp_wrappers/inetcf.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-esp.c#2 integrate .. //depot/projects/s390/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/s390/etc/MAKEDEV#4 integrate .. //depot/projects/s390/etc/Makefile#5 integrate .. //depot/projects/s390/etc/defaults/pccard.conf#3 integrate .. //depot/projects/s390/etc/defaults/periodic.conf#4 integrate .. //depot/projects/s390/etc/devd.conf#1 branch .. //depot/projects/s390/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/s390/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/s390/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/s390/etc/periodic/daily/150.clean-hoststat#3 integrate .. //depot/projects/s390/etc/periodic/daily/470.status-named#4 integrate .. //depot/projects/s390/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/s390/etc/periodic/security/900.tcpwrap#3 integrate .. //depot/projects/s390/etc/rc#6 integrate .. //depot/projects/s390/etc/rc.d/Makefile#4 integrate .. //depot/projects/s390/etc/rc.d/devd#2 integrate .. //depot/projects/s390/etc/rc.d/diskless#4 integrate .. //depot/projects/s390/etc/rc.d/initdiskless#4 integrate .. //depot/projects/s390/etc/rc.d/rcconf.sh#1 branch .. //depot/projects/s390/etc/rc.diskless1#4 integrate .. //depot/projects/s390/etc/rc.diskless2#3 integrate .. //depot/projects/s390/etc/services#3 integrate .. //depot/projects/s390/games/fortune/Notes#2 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes2#3 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/s390/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/s390/games/fortune/datfiles/startrek#3 integrate .. //depot/projects/s390/games/fortune/datfiles/startrek.sp.ok#2 integrate .. //depot/projects/s390/games/primes/pattern.c#3 integrate .. //depot/projects/s390/games/primes/primes.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/gdb/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#2 integrate .. //depot/projects/s390/include/Makefile#5 integrate .. //depot/projects/s390/include/limits.h#4 integrate .. //depot/projects/s390/include/pthread_np.h#3 integrate .. //depot/projects/s390/include/rpc/auth.h#2 integrate .. //depot/projects/s390/include/rpc/rpc_msg.h#2 integrate .. //depot/projects/s390/include/rpc/xdr.h#2 integrate .. //depot/projects/s390/include/rpcsvc/nis.x#2 integrate .. //depot/projects/s390/include/stdlib.h#4 integrate .. //depot/projects/s390/include/ulimit.h#2 integrate .. //depot/projects/s390/include/unistd.h#6 integrate .. //depot/projects/s390/include/wordexp.h#1 branch .. //depot/projects/s390/lib/Makefile#3 integrate .. //depot/projects/s390/lib/libalias/alias_nbt.c#2 integrate .. //depot/projects/s390/lib/libalias/alias_proxy.c#2 integrate .. //depot/projects/s390/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/s390/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/gen/basename.c#3 integrate .. //depot/projects/s390/lib/libc/gen/devname.3#3 integrate .. //depot/projects/s390/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/s390/lib/libc/gen/dirname.c#3 integrate .. //depot/projects/s390/lib/libc/gen/exec.c#2 integrate .. //depot/projects/s390/lib/libc/gen/fts.c#3 integrate .. //depot/projects/s390/lib/libc/gen/getbsize.3#3 integrate .. //depot/projects/s390/lib/libc/gen/getbsize.c#3 integrate .. //depot/projects/s390/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/s390/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/s390/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/s390/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/s390/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/s390/lib/libc/gen/getpagesize.3#3 integrate .. //depot/projects/s390/lib/libc/gen/getvfsent.c#3 integrate .. //depot/projects/s390/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/s390/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/s390/lib/libc/gen/popen.3#2 integrate .. //depot/projects/s390/lib/libc/gen/popen.c#2 integrate .. //depot/projects/s390/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/s390/lib/libc/gen/readpassphrase.3#3 integrate .. //depot/projects/s390/lib/libc/gen/setproctitle.c#2 integrate .. //depot/projects/s390/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/s390/lib/libc/gen/sysctlnametomib.c#2 integrate .. //depot/projects/s390/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/s390/lib/libc/gen/ualarm.3#3 integrate .. //depot/projects/s390/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/s390/lib/libc/gen/ulimit.3#4 integrate .. //depot/projects/s390/lib/libc/gen/ulimit.c#2 integrate .. //depot/projects/s390/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/s390/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/s390/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/s390/lib/libc/gen/wordexp.3#1 branch .. //depot/projects/s390/lib/libc/gen/wordexp.c#1 branch .. //depot/projects/s390/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/s390/lib/libc/i386/stdlib/ldiv.S#3 integrate .. //depot/projects/s390/lib/libc/i386/string/swab.S#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/s390/lib/libc/ia64/gen/Makefile.inc#3 integrate .. //depot/projects/s390/lib/libc/ia64/gen/__moddi3.S#2 integrate .. //depot/projects/s390/lib/libc/ia64/gen/__umoddi3.S#2 integrate .. //depot/projects/s390/lib/libc/ia64/gen/fpgetround.c#1 branch .. //depot/projects/s390/lib/libc/ia64/gen/fpsetround.c#1 branch .. //depot/projects/s390/lib/libc/include/namespace.h#3 integrate .. //depot/projects/s390/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/s390/lib/libc/locale/mbrune.3#4 integrate .. //depot/projects/s390/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/s390/lib/libc/net/gethostbynis.c#2 integrate .. //depot/projects/s390/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/s390/lib/libc/net/inet_neta.c#2 integrate .. //depot/projects/s390/lib/libc/net/ns_name.c#2 integrate .. //depot/projects/s390/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_dup.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_free.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_from_text.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_qualifier.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_tag_type.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_init.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_to_text.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_valid.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_valid.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_set.3#4 integrate .. //depot/projects/s390/lib/libc/rpc/PSD.doc/rpc.prog.ms#3 integrate .. //depot/projects/s390/lib/libc/rpc/PSD.doc/xdr.nts.ms#3 integrate .. //depot/projects/s390/lib/libc/rpc/rpc.3#4 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/s390/lib/libc/sparc64/gen/_setjmp.S#2 integrate .. //depot/projects/s390/lib/libc/sparc64/gen/setjmp.S#2 integrate .. //depot/projects/s390/lib/libc/sparc64/gen/sigsetjmp.S#2 integrate .. //depot/projects/s390/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/flockfile.3#1 branch .. //depot/projects/s390/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/s390/lib/libc/stdio/fscanf.c#3 integrate .. //depot/projects/s390/lib/libc/stdio/getc.3#3 integrate .. //depot/projects/s390/lib/libc/stdio/mktemp.3#3 integrate .. //depot/projects/s390/lib/libc/stdio/printf.3#5 integrate .. //depot/projects/s390/lib/libc/stdio/putc.3#5 integrate .. //depot/projects/s390/lib/libc/stdio/scanf.3#6 integrate .. //depot/projects/s390/lib/libc/stdio/scanf.c#3 integrate .. //depot/projects/s390/lib/libc/stdio/stdio.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/stdio.c#2 integrate .. //depot/projects/s390/lib/libc/stdio/unlocked.c#1 branch .. //depot/projects/s390/lib/libc/stdio/vscanf.c#4 integrate .. //depot/projects/s390/lib/libc/stdio/vswprintf.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/s390/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/grantpt.3#1 branch .. //depot/projects/s390/lib/libc/stdlib/grantpt.c#1 branch .. //depot/projects/s390/lib/libc/stdlib/insque.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/remque.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/strfmon.3#5 integrate .. //depot/projects/s390/lib/libc/stdlib/strfmon.c#4 integrate .. //depot/projects/s390/lib/libc/stdlib/strtoimax.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/tfind.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/tsearch.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/twalk.c#2 integrate .. //depot/projects/s390/lib/libc/stdtime/strftime.3#4 integrate .. //depot/projects/s390/lib/libc/stdtime/strptime.3#4 integrate .. //depot/projects/s390/lib/libc/string/strerror.c#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_read.2#4 integrate .. //depot/projects/s390/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/s390/lib/libc/sys/fhopen.2#4 integrate .. //depot/projects/s390/lib/libc/sys/kse.2#4 integrate .. //depot/projects/s390/lib/libc/sys/madvise.2#4 integrate .. //depot/projects/s390/lib/libc/sys/mmap.2#4 integrate .. //depot/projects/s390/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/s390/lib/libc/sys/mprotect.2#4 integrate .. //depot/projects/s390/lib/libc/sys/nfssvc.2#3 integrate .. //depot/projects/s390/lib/libc/sys/pathconf.2#4 integrate .. //depot/projects/s390/lib/libc/sys/rename.2#3 integrate .. //depot/projects/s390/lib/libc/sys/setuid.2#3 integrate .. //depot/projects/s390/lib/libc/sys/sigaction.2#5 integrate .. //depot/projects/s390/lib/libc/sys/socket.2#3 integrate .. //depot/projects/s390/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/s390/lib/libc_r/arch/sparc64/_atomic_lock.S#1 branch .. //depot/projects/s390/lib/libc_r/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_mutexattr.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/sem_destroy.3#2 integrate .. //depot/projects/s390/lib/libc_r/uthread/pthread_private.h#4 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_attr_get_np.c#2 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_create.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_info.c#4 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_init.c#4 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_sig.c#4 integrate .. //depot/projects/s390/lib/libcam/cam_cdbparse.3#2 integrate .. //depot/projects/s390/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/s390/lib/libdevinfo/devinfo.3#3 integrate .. //depot/projects/s390/lib/libdisk/chunk.c#4 integrate .. //depot/projects/s390/lib/libdisk/create_chunk.c#4 integrate .. //depot/projects/s390/lib/libdisk/disk.c#5 integrate .. //depot/projects/s390/lib/libdisk/libdisk.h#4 integrate .. //depot/projects/s390/lib/libdisk/write_pc98_disk.c#2 integrate .. //depot/projects/s390/lib/libedit/chared.h#2 integrate .. //depot/projects/s390/lib/libedit/common.c#2 integrate .. //depot/projects/s390/lib/libedit/editrc.5#2 integrate .. //depot/projects/s390/lib/libedit/emacs.c#2 integrate .. //depot/projects/s390/lib/libedit/key.c#2 integrate .. //depot/projects/s390/lib/libedit/vi.c#2 integrate .. //depot/projects/s390/lib/libexpat/libbsdxml.3#2 integrate .. //depot/projects/s390/lib/libfetch/common.c#4 integrate .. //depot/projects/s390/lib/libfetch/fetch.3#3 integrate .. //depot/projects/s390/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/s390/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/s390/lib/libkvm/kvm.3#3 integrate .. //depot/projects/s390/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/s390/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/s390/lib/libmp/Makefile#2 integrate .. //depot/projects/s390/lib/libnetgraph/netgraph.3#2 integrate .. //depot/projects/s390/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ftp/pam_ftp.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_krb5/pam_krb5.c#3 integrate .. //depot/projects/s390/lib/libpam/modules/pam_opie/pam_opie.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/pam_ssh.8#3 integrate .. //depot/projects/s390/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/s390/lib/libpthread/man/pthread_mutexattr.3#2 integrate .. //depot/projects/s390/lib/libpthread/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/s390/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/s390/lib/libpthread/man/sem_destroy.3#2 integrate .. //depot/projects/s390/lib/libugidfw/Makefile#2 integrate .. //depot/projects/s390/lib/libugidfw/bsde_get_rule.3#1 branch .. //depot/projects/s390/lib/libugidfw/bsde_get_rule_count.3#1 branch .. //depot/projects/s390/lib/libugidfw/bsde_parse_rule.3#1 branch .. //depot/projects/s390/lib/libugidfw/bsde_rule_to_string.3#1 branch .. //depot/projects/s390/lib/libugidfw/libugidfw.3#1 branch .. //depot/projects/s390/lib/libutil/auth.3#2 integrate .. //depot/projects/s390/lib/libutil/login_cap.3#2 integrate .. //depot/projects/s390/lib/libutil/realhostname_sa.3#2 integrate .. //depot/projects/s390/lib/libvgl/vgl.3#2 integrate .. //depot/projects/s390/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/s390/lib/msun/man/hypot.3#2 integrate .. //depot/projects/s390/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/s390/libexec/Makefile#5 integrate .. //depot/projects/s390/libexec/atrun/atrun.man#2 integrate .. //depot/projects/s390/libexec/bootpd/getether.c#3 integrate .. //depot/projects/s390/libexec/ftpd/ftpd.8#4 integrate .. //depot/projects/s390/libexec/getty/chat.c#2 integrate .. //depot/projects/s390/libexec/getty/getty.8#2 integrate .. //depot/projects/s390/libexec/getty/gettytab.5#3 integrate .. //depot/projects/s390/libexec/lukemftpd/Makefile#4 integrate .. //depot/projects/s390/libexec/lukemftpd/nbsd2fbsd.h#1 branch .. //depot/projects/s390/libexec/lukemftpd/util.h#1 branch .. //depot/projects/s390/libexec/mknetid/hash.c#2 integrate .. //depot/projects/s390/libexec/mknetid/mknetid.8#2 integrate .. //depot/projects/s390/libexec/mknetid/netid.5#2 integrate .. //depot/projects/s390/libexec/pt_chown/Makefile#1 branch .. //depot/projects/s390/libexec/pt_chown/pt_chown.c#1 branch .. //depot/projects/s390/libexec/rlogind/rlogind.8#2 integrate .. //depot/projects/s390/libexec/rtld-aout/dynamic.h#2 integrate .. //depot/projects/s390/libexec/rtld-aout/rtld.c#2 integrate .. //depot/projects/s390/libexec/ypxfr/ypxfr.8#3 integrate .. //depot/projects/s390/release/Makefile#7 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#5 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/readme/article.sgml#5 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/Makefile#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/hw.ent#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#1 branch .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#1 branch .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/Makefile#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#3 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml#2 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile#1 branch .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#1 branch .. //depot/projects/s390/release/i386/drivers.conf#6 integrate .. //depot/projects/s390/release/scripts/print-cdrom-packages.sh#5 integrate .. //depot/projects/s390/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/s390/sbin/atm/atm/atm.8#2 integrate .. //depot/projects/s390/sbin/atm/ilmid/ilmid.c#3 integrate .. //depot/projects/s390/sbin/ccdconfig/ccdconfig.8#3 integrate .. //depot/projects/s390/sbin/ccdconfig/ccdconfig.c#2 integrate .. //depot/projects/s390/sbin/devd/devd-generic#3 delete .. //depot/projects/s390/sbin/devd/devd.8#2 integrate .. //depot/projects/s390/sbin/devd/devd.cc#2 integrate .. //depot/projects/s390/sbin/devd/devd.conf#3 delete .. //depot/projects/s390/sbin/devd/devd.conf.5#3 integrate .. //depot/projects/s390/sbin/disklabel/disklabel.8#4 integrate .. //depot/projects/s390/sbin/disklabel/disklabel.c#5 integrate .. //depot/projects/s390/sbin/dump/dump.8#5 integrate .. //depot/projects/s390/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/s390/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/s390/sbin/fdisk_pc98/fdisk.c#4 integrate .. //depot/projects/s390/sbin/fsck/fsck.8#4 integrate .. //depot/projects/s390/sbin/growfs/growfs.c#4 integrate .. //depot/projects/s390/sbin/ip6fw/ip6fw.8#3 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.c#3 integrate .. //depot/projects/s390/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/s390/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/s390/sbin/mount_ext2fs/mount_ext2fs.8#3 integrate .. //depot/projects/s390/sbin/mount_hpfs/mount_hpfs.8#3 integrate .. //depot/projects/s390/sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/s390/sbin/natd/natd.c#2 integrate .. //depot/projects/s390/sbin/ping/ping.8#3 integrate .. //depot/projects/s390/sbin/raidctl/raidctl.8#3 integrate .. //depot/projects/s390/sbin/reboot/reboot.8#4 integrate .. //depot/projects/s390/sbin/restore/restore.8#3 integrate .. //depot/projects/s390/sbin/routed/if.c#2 integrate .. //depot/projects/s390/sbin/routed/table.c#2 integrate .. //depot/projects/s390/sbin/savecore/savecore.c#2 integrate .. //depot/projects/s390/sbin/shutdown/shutdown.8#3 integrate .. //depot/projects/s390/sbin/slattach/slattach.8#2 integrate .. //depot/projects/s390/sbin/slattach/slattach.c#2 integrate .. //depot/projects/s390/sbin/swapon/Makefile#3 integrate .. //depot/projects/s390/sbin/swapon/swapon.8#4 integrate .. //depot/projects/s390/sbin/swapon/swapon.c#3 integrate .. //depot/projects/s390/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/s390/sbin/umount/umount.c#3 integrate .. //depot/projects/s390/sbin/vinum/vinum.8#3 integrate .. //depot/projects/s390/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/s390/share/Makefile#3 integrate .. //depot/projects/s390/share/colldef/Makefile#4 integrate .. //depot/projects/s390/share/colldef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/s390/share/colldef/ca_ES.ISO8859-15.src#1 branch .. //depot/projects/s390/share/doc/IPv6/IMPLEMENTATION#2 integrate .. //depot/projects/s390/share/doc/papers/diskperf/motivation.ms#2 integrate .. //depot/projects/s390/share/doc/papers/diskperf/tests.ms#2 integrate .. //depot/projects/s390/share/doc/papers/sysperf/4.t#2 integrate .. //depot/projects/s390/share/doc/papers/sysperf/5.t#2 integrate .. //depot/projects/s390/share/doc/psd/21.ipc/3.t#2 integrate .. //depot/projects/s390/share/doc/smm/01.setup/3.t#2 integrate .. //depot/projects/s390/share/doc/smm/05.fastfs/3.t#2 integrate .. //depot/projects/s390/share/doc/smm/06.nfs/1.t#2 integrate .. //depot/projects/s390/share/doc/smm/06.nfs/2.t#2 integrate .. //depot/projects/s390/share/doc/smm/18.net/7.t#2 integrate .. //depot/projects/s390/share/doc/usd/18.msdiffs/ms.diffs#2 integrate .. //depot/projects/s390/share/doc/usd/21.troff/m1#2 integrate .. //depot/projects/s390/share/doc/usd/21.troff/m2#2 integrate .. //depot/projects/s390/share/doc/usd/22.trofftut/tt04#2 integrate .. //depot/projects/s390/share/examples/cvsup/refuse#2 integrate .. //depot/projects/s390/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/s390/share/examples/ipfilter/examples.txt#2 integrate .. //depot/projects/s390/share/examples/ipfilter/firewall.1#2 integrate .. //depot/projects/s390/share/examples/ipfilter/firewall.2#2 integrate .. //depot/projects/s390/share/examples/ipfilter/ipf-howto.txt#2 integrate .. //depot/projects/s390/share/examples/isdn/FAQ#3 integrate .. //depot/projects/s390/share/examples/isdn/Overview#2 integrate .. //depot/projects/s390/share/examples/isdn/i4brunppp/README#2 integrate .. //depot/projects/s390/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/s390/share/examples/ppp/ppp.conf.sample#2 integrate .. //depot/projects/s390/share/man/man4/Makefile#5 integrate .. //depot/projects/s390/share/man/man4/ahd.4#3 integrate .. //depot/projects/s390/share/man/man4/blackhole.4#2 integrate .. //depot/projects/s390/share/man/man4/ccd.4#3 integrate .. //depot/projects/s390/share/man/man4/ciss.4#1 branch .. //depot/projects/s390/share/man/man4/crypto.4#3 integrate .. //depot/projects/s390/share/man/man4/geom.4#3 integrate .. //depot/projects/s390/share/man/man4/gif.4#3 integrate .. //depot/projects/s390/share/man/man4/ida.4#1 branch .. //depot/projects/s390/share/man/man4/ieee80211.4#2 integrate .. //depot/projects/s390/share/man/man4/iir.4#1 branch .. //depot/projects/s390/share/man/man4/keyboard.4#2 integrate .. //depot/projects/s390/share/man/man4/lmc.4#1 branch .. //depot/projects/s390/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/s390/share/man/man4/mac_bsdextended.4#3 integrate .. //depot/projects/s390/share/man/man4/mac_ifoff.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_lomac.4#1 branch .. //depot/projects/s390/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/s390/share/man/man4/mac_none.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_test.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/rdp.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_bluetooth.4#3 integrate .. //depot/projects/s390/share/man/man4/ng_btsocket.4#3 integrate .. //depot/projects/s390/share/man/man4/ng_hci.4#3 integrate .. //depot/projects/s390/share/man/man4/ng_one2many.4#2 integrate .. //depot/projects/s390/share/man/man4/polling.4#2 integrate .. //depot/projects/s390/share/man/man4/psm.4#2 integrate .. //depot/projects/s390/share/man/man4/tcp.4#5 integrate .. //depot/projects/s390/share/man/man4/ti.4#3 integrate .. //depot/projects/s390/share/man/man4/trm.4#2 integrate .. //depot/projects/s390/share/man/man4/wi.4#4 integrate .. //depot/projects/s390/share/man/man4/worm.4#2 integrate .. //depot/projects/s390/share/man/man5/Makefile#3 integrate .. //depot/projects/s390/share/man/man5/elf.5#2 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#5 integrate .. //depot/projects/s390/share/man/man5/msdosfs.5#1 branch .. //depot/projects/s390/share/man/man5/periodic.conf.5#5 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/s390/share/man/man7/Makefile#3 integrate .. //depot/projects/s390/share/man/man7/development.7#1 branch .. //depot/projects/s390/share/man/man7/hier.7#5 integrate .. //depot/projects/s390/share/man/man7/ports.7#4 integrate .. //depot/projects/s390/share/man/man7/security.7#3 integrate .. //depot/projects/s390/share/man/man7/tuning.7#5 integrate .. //depot/projects/s390/share/man/man8/adding_user.8#3 integrate .. //depot/projects/s390/share/man/man8/diskless.8#4 integrate .. //depot/projects/s390/share/man/man8/picobsd.8#4 integrate .. //depot/projects/s390/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/s390/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_ATTRIB.9#4 integrate .. //depot/projects/s390/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_LINK.9#4 integrate .. //depot/projects/s390/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/s390/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/s390/share/man/man9/accf_data.9#2 integrate .. //depot/projects/s390/share/man/man9/accf_http.9#2 integrate .. //depot/projects/s390/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/s390/share/man/man9/device_enable.9#2 integrate .. //depot/projects/s390/share/man/man9/device_get_state.9#2 integrate .. //depot/projects/s390/share/man/man9/device_quiet.9#2 integrate .. //depot/projects/s390/share/man/man9/device_set_desc.9#2 integrate .. //depot/projects/s390/share/man/man9/device_set_flags.9#2 integrate .. //depot/projects/s390/share/man/man9/mac.9#3 integrate .. //depot/projects/s390/share/man/man9/malloc.9#2 integrate .. //depot/projects/s390/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/s390/share/man/man9/microseq.9#2 integrate .. //depot/projects/s390/share/man/man9/scheduler.9#2 integrate .. //depot/projects/s390/share/man/man9/sleep.9#2 integrate .. //depot/projects/s390/share/man/man9/style.9#4 integrate .. //depot/projects/s390/share/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/s390/share/man/man9/vget.9#2 integrate .. //depot/projects/s390/share/man/man9/vref.9#2 integrate .. //depot/projects/s390/share/man/man9/vrele.9#2 integrate .. //depot/projects/s390/share/misc/pci_vendors#4 integrate .. //depot/projects/s390/share/mklocale/Makefile#4 integrate .. //depot/projects/s390/share/monetdef/Makefile#4 integrate .. //depot/projects/s390/share/monetdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/s390/share/msgdef/Makefile#4 integrate .. //depot/projects/s390/share/msgdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/s390/share/numericdef/Makefile#4 integrate .. //depot/projects/s390/share/numericdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/s390/share/termcap/map3270#2 integrate .. //depot/projects/s390/share/termcap/termcap.src#4 integrate .. //depot/projects/s390/share/timedef/Makefile#4 integrate .. //depot/projects/s390/share/timedef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/s390/sys/alpha/alpha/dump_machdep.c#3 integrate .. //depot/projects/s390/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/s390/sys/alpha/include/limits.h#3 integrate .. //depot/projects/s390/sys/arm/include/limits.h#3 integrate .. //depot/projects/s390/sys/boot/ficl/words.c#3 integrate .. //depot/projects/s390/sys/boot/i386/Makefile#2 integrate .. //depot/projects/s390/sys/boot/i386/liloldr/Makefile#3 delete .. //depot/projects/s390/sys/boot/i386/liloldr/lilobsect.s#2 delete .. //depot/projects/s390/sys/boot/i386/liloldr/liloldr.s#2 delete .. //depot/projects/s390/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/disk.c#3 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/s390/sys/cam/cam_queue.c#2 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/s390/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/s390/sys/conf/NOTES#6 integrate .. //depot/projects/s390/sys/conf/files#7 integrate .. //depot/projects/s390/sys/conf/files.ia64#4 integrate .. //depot/projects/s390/sys/conf/files.powerpc#3 integrate .. //depot/projects/s390/sys/conf/ldscript.i386#3 integrate .. //depot/projects/s390/sys/conf/majors#5 integrate .. //depot/projects/s390/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/s390/sys/ddb/db_break.c#2 integrate .. //depot/projects/s390/sys/ddb/db_break.h#2 integrate .. //depot/projects/s390/sys/ddb/db_command.c#3 integrate .. //depot/projects/s390/sys/ddb/db_ps.c#4 integrate .. //depot/projects/s390/sys/ddb/ddb.h#3 integrate .. //depot/projects/s390/sys/dev/aac/aac.c#4 integrate .. //depot/projects/s390/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/s390/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/s390/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/s390/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/s390/sys/dev/aha/aha.c#3 integrate .. //depot/projects/s390/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/s390/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/s390/sys/dev/aic7xxx/ahd_pci.c#5 integrate .. //depot/projects/s390/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/s390/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/s390/sys/dev/amr/amr.c#5 integrate .. //depot/projects/s390/sys/dev/an/if_aironet_ieee.h#3 integrate .. //depot/projects/s390/sys/dev/an/if_an.c#4 integrate .. //depot/projects/s390/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/s390/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/s390/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/s390/sys/dev/ar/if_arregs.h#2 integrate .. //depot/projects/s390/sys/dev/asr/asr.c#4 integrate .. //depot/projects/s390/sys/dev/asr/osd_util.h#2 integrate .. //depot/projects/s390/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/s390/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/s390/sys/dev/awi/awi.c#4 integrate .. //depot/projects/s390/sys/dev/awi/awi_wep.c#3 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/s390/sys/dev/ccd/ccd.c#3 integrate .. //depot/projects/s390/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/s390/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/s390/sys/dev/em/LICENSE#1 branch .. //depot/projects/s390/sys/dev/em/README#4 integrate .. //depot/projects/s390/sys/dev/em/if_em.c#4 integrate .. //depot/projects/s390/sys/dev/em/if_em.h#4 integrate .. //depot/projects/s390/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/s390/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/s390/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/s390/sys/dev/en/midway.c#4 integrate .. //depot/projects/s390/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/s390/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/s390/sys/dev/firewire/firewirebusreg.h#2 delete .. //depot/projects/s390/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/fwcrom.c#1 branch .. //depot/projects/s390/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/s390/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/s390/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/s390/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/s390/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/s390/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/s390/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/s390/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/s390/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/s390/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/s390/sys/dev/hea/eni.h#3 integrate .. //depot/projects/s390/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/s390/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/s390/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/s390/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/s390/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/s390/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/s390/sys/dev/idt/idt.c#2 integrate .. //depot/projects/s390/sys/dev/idt/idtvar.h#2 integrate .. //depot/projects/s390/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/s390/sys/dev/isp/Hardware.txt#2 integrate .. //depot/projects/s390/sys/dev/isp/isp.c#4 integrate .. //depot/projects/s390/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/s390/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/s390/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/s390/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/s390/sys/dev/mly/mly.c#5 integrate .. //depot/projects/s390/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/s390/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/s390/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/s390/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/s390/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/s390/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/s390/sys/dev/puc/puc.c#3 integrate .. //depot/projects/s390/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/s390/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/s390/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate .. //depot/projects/s390/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/s390/sys/dev/sab/sab.c#3 integrate .. //depot/projects/s390/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/s390/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/s390/sys/dev/streams/streams.c#3 integrate .. //depot/projects/s390/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/s390/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/s390/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/s390/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/s390/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/s390/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/s390/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#5 integrate .. //depot/projects/s390/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/s390/sys/dev/usb/urio.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/s390/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/s390/sys/dev/usb/usbcdc.h#2 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/s390/sys/dev/vinum/vinumdaemon.c#4 integrate .. //depot/projects/s390/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/s390/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/s390/sys/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/s390/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/s390/sys/dev/wi/wi_hostap.c#4 integrate .. //depot/projects/s390/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/s390/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/s390/sys/dev/zs/z8530reg.h#1 branch .. //depot/projects/s390/sys/dev/zs/z8530var.h#1 branch .. //depot/projects/s390/sys/dev/zs/zs.c#1 branch .. //depot/projects/s390/sys/dev/zs/zs_sbus.c#1 branch .. //depot/projects/s390/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/s390/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/s390/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/s390/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/s390/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/specfs/spec_vnops.c#5 integrate .. //depot/projects/s390/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/s390/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/s390/sys/geom/bde/g_bde.h#2 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/s390/sys/geom/geom_bsd.c#5 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#6 integrate .. //depot/projects/s390/sys/geom/geom_io.c#6 integrate .. //depot/projects/s390/sys/geom/geom_kern.c#5 integrate .. //depot/projects/s390/sys/geom/geom_mbr.c#5 integrate .. //depot/projects/s390/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/s390/sys/geom/geom_subr.c#6 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/i386/conf/OLDCARD#5 integrate .. //depot/projects/s390/sys/i386/conf/SMP#1 branch .. //depot/projects/s390/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/s390/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/s390/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/s390/sys/i386/i386/locore.s#4 integrate .. //depot/projects/s390/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/s390/sys/i386/i386/mem.c#4 integrate .. //depot/projects/s390/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/s390/sys/i386/include/limits.h#3 integrate .. //depot/projects/s390/sys/i386/include/md_var.h#4 integrate .. //depot/projects/s390/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/s390/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/s390/sys/i386/isa/istallion.c#2 integrate .. //depot/projects/s390/sys/i386/isa/mse.c#2 integrate .. //depot/projects/s390/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/s390/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/s390/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/s390/sys/i4b/layer3/i4b_q931.h#2 integrate .. //depot/projects/s390/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/s390/sys/ia64/acpica/madt.c#3 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/s390/sys/ia64/conf/SKI#4 integrate .. //depot/projects/s390/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/s390/sys/ia64/ia64/clock.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/locore.s#3 integrate .. //depot/projects/s390/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/s390/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/s390/sys/ia64/include/bus.h#4 integrate .. //depot/projects/s390/sys/ia64/include/clock.h#3 integrate .. //depot/projects/s390/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/s390/sys/ia64/include/intr.h#2 integrate .. //depot/projects/s390/sys/ia64/include/intrcnt.h#3 integrate .. //depot/projects/s390/sys/ia64/include/limits.h#3 integrate .. //depot/projects/s390/sys/isa/fd.c#4 integrate .. //depot/projects/s390/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/s390/sys/kern/imgact_elf32.c#3 integrate .. //depot/projects/s390/sys/kern/imgact_elf64.c#3 integrate .. //depot/projects/s390/sys/kern/imgact_elfN.c#2 delete .. //depot/projects/s390/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/s390/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/s390/sys/kern/init_main.c#5 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#5 integrate .. //depot/projects/s390/sys/kern/kern_acl.c#4 integrate .. //depot/projects/s390/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#3 integrate .. //depot/projects/s390/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/s390/sys/kern/kern_event.c#4 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#6 integrate .. //depot/projects/s390/sys/kern/kern_fork.c#7 integrate .. //depot/projects/s390/sys/kern/kern_intr.c#4 integrate .. //depot/projects/s390/sys/kern/kern_mib.c#5 integrate .. //depot/projects/s390/sys/kern/kern_module.c#3 integrate .. //depot/projects/s390/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/s390/sys/kern/kern_physio.c#3 integrate .. //depot/projects/s390/sys/kern/kern_proc.c#5 integrate .. //depot/projects/s390/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/s390/sys/kern/kern_sig.c#5 integrate .. //depot/projects/s390/sys/kern/kern_subr.c#7 integrate .. //depot/projects/s390/sys/kern/kern_switch.c#5 integrate .. //depot/projects/s390/sys/kern/kern_synch.c#6 integrate .. //depot/projects/s390/sys/kern/kern_tc.c#5 integrate .. //depot/projects/s390/sys/kern/kern_thread.c#5 integrate .. //depot/projects/s390/sys/kern/kern_time.c#5 integrate .. //depot/projects/s390/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/s390/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/s390/sys/kern/subr_blist.c#3 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#5 integrate .. //depot/projects/s390/sys/kern/subr_disklabel.c#3 integrate .. //depot/projects/s390/sys/kern/subr_diskmbr.c#3 integrate .. //depot/projects/s390/sys/kern/subr_mbuf.c#5 integrate .. //depot/projects/s390/sys/kern/subr_prf.c#5 integrate .. //depot/projects/s390/sys/kern/subr_prof.c#3 integrate .. //depot/projects/s390/sys/kern/subr_smp.c#3 integrate .. //depot/projects/s390/sys/kern/subr_trap.c#5 integrate .. //depot/projects/s390/sys/kern/subr_witness.c#5 integrate .. //depot/projects/s390/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/s390/sys/kern/sys_socket.c#4 integrate .. //depot/projects/s390/sys/kern/syscalls.c#5 integrate .. //depot/projects/s390/sys/kern/syscalls.master#6 integrate .. //depot/projects/s390/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/s390/sys/kern/tty_pty.c#2 integrate .. //depot/projects/s390/sys/kern/tty_subr.c#2 integrate .. //depot/projects/s390/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/s390/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/s390/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/s390/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/s390/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/s390/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/s390/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/s390/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/s390/sys/kern/vfs_default.c#5 integrate .. //depot/projects/s390/sys/kern/vfs_export.c#2 integrate .. //depot/projects/s390/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/s390/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/s390/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/s390/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/s390/sys/kern/vnode_if.src#3 integrate .. //depot/projects/s390/sys/libkern/ia64/__moddi3.S#2 integrate .. //depot/projects/s390/sys/libkern/ia64/__umoddi3.S#2 integrate .. //depot/projects/s390/sys/modules/Makefile#6 integrate .. //depot/projects/s390/sys/modules/firewire/firewire/Makefile#4 integrate .. //depot/projects/s390/sys/modules/gem/Makefile#1 branch .. //depot/projects/s390/sys/modules/hme/Makefile#1 branch .. //depot/projects/s390/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/s390/sys/net/bpf.c#4 integrate .. //depot/projects/s390/sys/net/bridge.c#6 integrate .. //depot/projects/s390/sys/net/if.c#5 integrate .. //depot/projects/s390/sys/net/if_ef.c#3 integrate .. //depot/projects/s390/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/s390/sys/net/if_loop.c#5 integrate .. //depot/projects/s390/sys/net/if_stf.c#5 integrate .. //depot/projects/s390/sys/net/if_var.h#5 integrate .. //depot/projects/s390/sys/net/radix.c#4 integrate .. //depot/projects/s390/sys/net/radix.h#3 integrate .. //depot/projects/s390/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/s390/sys/net/route.c#4 integrate .. //depot/projects/s390/sys/net/rtsock.c#4 integrate .. //depot/projects/s390/sys/netatm/atm_cm.c#4 integrate .. //depot/projects/s390/sys/netatm/atm_if.c#4 integrate .. //depot/projects/s390/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/s390/sys/netatm/port.h#3 integrate .. //depot/projects/s390/sys/netatm/spans/spans_kxdr.h#2 integrate .. //depot/projects/s390/sys/netatm/spans/spans_msg.c#3 integrate .. //depot/projects/s390/sys/netatm/spans/spans_util.c#2 integrate .. //depot/projects/s390/sys/netatm/uni/sscop_lower.c#3 integrate .. //depot/projects/s390/sys/netatm/uni/unisig_print.c#2 integrate .. //depot/projects/s390/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/s390/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/s390/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/s390/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/s390/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/s390/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/s390/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#3 integrate .. //depot/projects/s390/sys/netinet/in.h#4 integrate .. //depot/projects/s390/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/s390/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/s390/sys/netinet/ip_fw.c#3 integrate .. //depot/projects/s390/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/s390/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/s390/sys/netinet/ip_input.c#5 integrate .. //depot/projects/s390/sys/netinet/ip_output.c#5 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/s390/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/s390/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/s390/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/s390/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/s390/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/s390/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/s390/sys/netinet6/in6.c#3 integrate .. //depot/projects/s390/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/s390/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/s390/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/s390/sys/netinet6/ip6_fw.c#4 integrate .. //depot/projects/s390/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/s390/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/s390/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/s390/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/s390/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/s390/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/s390/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/s390/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/s390/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/s390/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/s390/sys/netipsec/key.c#2 integrate .. //depot/projects/s390/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/s390/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/s390/sys/netkey/key.c#2 integrate .. //depot/projects/s390/sys/netkey/keydb.h#2 integrate .. //depot/projects/s390/sys/netkey/keysock.c#3 integrate .. //depot/projects/s390/sys/netsmb/smb.h#4 integrate .. //depot/projects/s390/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/s390/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/s390/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/s390/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/s390/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/s390/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/s390/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/s390/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/s390/sys/pc98/i386/machdep.c#5 integrate .. //depot/projects/s390/sys/pc98/pc98/diskslice_machdep.c#4 integrate .. //depot/projects/s390/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/s390/sys/pc98/pc98/mse.c#2 integrate .. //depot/projects/s390/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/s390/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/s390/sys/pccard/pcic_isa.c#2 integrate .. //depot/projects/s390/sys/pccard/pcic_pci.c#3 integrate .. //depot/projects/s390/sys/pci/agp.c#4 integrate .. //depot/projects/s390/sys/pci/if_dc.c#5 integrate .. //depot/projects/s390/sys/pci/if_dcreg.h#4 integrate .. //depot/projects/s390/sys/pci/if_de.c#4 integrate .. //depot/projects/s390/sys/pci/if_rl.c#5 integrate .. //depot/projects/s390/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/s390/sys/pci/if_sis.c#6 integrate .. //depot/projects/s390/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/s390/sys/pci/if_ste.c#4 integrate .. //depot/projects/s390/sys/pci/if_stereg.h#3 integrate .. //depot/projects/s390/sys/pci/if_vr.c#5 integrate .. //depot/projects/s390/sys/pci/if_wb.c#5 integrate .. //depot/projects/s390/sys/pci/if_xl.c#6 integrate .. //depot/projects/s390/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/s390/sys/pci/ncr.c#4 integrate .. //depot/projects/s390/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/s390/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/s390/sys/powerpc/include/bus.h#3 integrate .. //depot/projects/s390/sys/powerpc/include/limits.h#3 integrate .. //depot/projects/s390/sys/powerpc/ofw/ofw_pci.c#2 integrate .. //depot/projects/s390/sys/powerpc/ofw/ofw_pcib_pci.c#1 branch .. //depot/projects/s390/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/s390/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/s390/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/s390/sys/powerpc/powerpc/atomic.S#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/s390/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/s390/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/s390/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/s390/sys/powerpc/powerpc/interrupt.c#3 integrate .. //depot/projects/s390/sys/powerpc/powerpc/locore.S#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/s390/sys/powerpc/powerpc/ofwmagic.S#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/swtch.S#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/vm_machdep.c#5 integrate .. //depot/projects/s390/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/s390/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/s390/sys/sparc64/include/bus.h#3 integrate .. //depot/projects/s390/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/s390/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/s390/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/s390/sys/sparc64/include/iommuvar.h#3 integrate .. //depot/projects/s390/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/s390/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/s390/sys/sparc64/include/smp.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message