Date: Fri, 21 Nov 2003 10:30:51 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42894 for review Message-ID: <200311211830.hALIUpw4002200@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42894 Change 42894 by peter@peter_daintree on 2003/11/21 10:30:34 IFC @42893 Affected files ... .. //depot/projects/hammer/UPDATING#28 integrate .. //depot/projects/hammer/bin/Makefile.inc#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/getfsstat.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/setgroups.2#4 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#47 integrate .. //depot/projects/hammer/sbin/Makefile.inc#5 integrate .. //depot/projects/hammer/sbin/dump/dump.8#8 integrate .. //depot/projects/hammer/sbin/init/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#27 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#14 integrate .. //depot/projects/hammer/share/man/man4/ncv.4#1 branch .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#71 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#20 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/_stdint.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#30 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#17 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#7 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/hammer/sys/conf/files#39 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/hammer/sys/dev/md/md.c#18 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#10 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#7 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/hammer/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/linux/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/null/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ppbus/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ppi/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pps/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/streams/Makefile#2 integrate .. //depot/projects/hammer/sys/net/if_faith.c#7 integrate .. //depot/projects/hammer/sys/net/if_loop.c#13 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/hammer/sys/net/route.c#9 integrate .. //depot/projects/hammer/sys/net/route.h#7 integrate .. //depot/projects/hammer/sys/net/rtsock.c#9 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_usrreq.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#24 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#23 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#7 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#8 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#9 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#9 integrate .. //depot/projects/hammer/sys/rpc/rpcv2.h#2 delete .. //depot/projects/hammer/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#20 integrate .. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#7 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#20 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/hammer/sys/sys/mac.h#15 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#14 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#4 integrate .. //depot/projects/hammer/sys/sys/protosw.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#28 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#7 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/hammer/usr.sbin/mtree/spec.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#17 integrate Differences ... ==== //depot/projects/hammer/UPDATING#28 (text+ko) ==== @@ -20,10 +20,10 @@ 20031112: The statfs structure has been updated with 64-bit fields to allow accurate reporting of multi-terabyte filesystem - sizes. You should build and boot a new kernel BEFORE doing a - `make world' as the new kernel will know about binaries using - the old statfs structure, but an old kernel will not know - about the new system calls that support the new statfs + sizes. You should build world, then build and boot the new kernel + BEFORE doing a `installworld' as the new kernel will know about + binaries using the old statfs structure, but an old kernel will + not know about the new system calls that support the new statfs structure. Note that the backwards compatibility is only present when the kernel is configured with the COMPAT_FREEBSD4 option. Since @@ -1431,4 +1431,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.281 2003/11/14 22:11:44 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.282 2003/11/17 23:25:16 rwatson Exp $ ==== //depot/projects/hammer/bin/Makefile.inc#6 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.19 2003/11/16 04:57:28 gordon Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.20 2003/11/19 16:59:00 marcel Exp $ BINDIR?= /bin WARNS?= 6 -.if defined(NO_DYNAMICROOT) +.if defined(NO_DYNAMICROOT) || ${MACHINE_ARCH} == "ia64" NOSHARED?= YES .endif ==== //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#22 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $ */ #include <sys/types.h> @@ -179,13 +179,13 @@ resp[i]->resp = NULL; switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - resp[i]->resp = prompt_echo_off(msg[i]->msg); - if (resp[i]->resp == NULL) + (*resp[i]).resp = prompt_echo_off(msg[i]->msg); + if ((*resp[i]).resp == NULL) goto fail; break; case PAM_PROMPT_ECHO_ON: - resp[i]->resp = prompt(msg[i]->msg); - if (resp[i]->resp == NULL) + (*resp[i]).resp = prompt(msg[i]->msg); + if ((*resp[i]).resp == NULL) goto fail; break; case PAM_ERROR_MSG: @@ -206,11 +206,13 @@ } RETURNC(PAM_SUCCESS); fail: - while (i) - if (resp[--i]->resp) { - memset(resp[i]->resp, 0, strlen(resp[i]->resp)); - FREE(resp[i]->resp); + for (i = 0; i < n; ++i) { + if ((*resp[i]).resp != NULL) { + memset((*resp[i]).resp, 0, strlen((*resp[i]).resp)); + FREE((*resp[i]).resp); } + } + memset(*resp, 0, n * sizeof **resp); FREE(*resp); RETURNC(PAM_CONV_ERR); } ==== //depot/projects/hammer/lib/libc/gen/initgroups.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)initgroups.c 8.1 (Berkeley) 6/4/93"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.8 2003/11/19 15:51:26 dds Exp $"); #include <sys/param.h> @@ -50,9 +50,14 @@ const char *uname; gid_t agroup; { - int groups[NGROUPS], ngroups; + int ngroups; + /* + * Provide space for one group more than NGROUPS to allow + * setgroups to fail and set errno. + */ + gid_t groups[NGROUPS + 1]; - ngroups = NGROUPS; + ngroups = NGROUPS + 1; getgrouplist(uname, agroup, groups, &ngroups); return (setgroups(ngroups, groups)); } ==== //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_setup.c,v 1.4 2002/05/13 04:35:08 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_setup.c,v 1.5 2003/11/18 14:21:41 jake Exp $"); #include <sys/types.h> @@ -48,6 +48,8 @@ sizeof (ua) / sizeof (*ua), ua }; +void __sparc_utrap_setup(void) __attribute__((constructor)); + void __sparc_utrap_setup(void) { ==== //depot/projects/hammer/lib/libc/sys/getfsstat.2#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.15 2003/06/08 10:01:52 charnier Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.16 2003/11/21 01:30:28 tjr Exp $ .\" -.Dd May 25, 1995 +.Dd November 20, 2003 .Dt GETFSSTAT 2 .Os .Sh NAME @@ -56,69 +56,8 @@ argument is a pointer to .Vt statfs -structures defined as follows: -.Bd -literal -typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */ - -/* - * file system statistics - */ - -#define MFSNAMELEN 16 /* length of fs type name, including null */ -#define MNAMELEN 90 /* length of buffer for returned name */ - -struct statfs { - long f_spare2; /* placeholder */ - long f_bsize; /* fundamental file system block size */ - long f_iosize; /* optimal transfer block size */ - long f_blocks; /* total data blocks in file system */ - long f_bfree; /* free blocks in fs */ - long f_bavail; /* free blocks avail to non-superuser */ - long f_files; /* total file nodes in file system */ - long f_ffree; /* free file nodes in fs */ - fsid_t f_fsid; /* file system id */ - uid_t f_owner; /* user that mounted the file system */ - int f_type; /* type of file system (see below) */ - int f_flags; /* copy of mount flags */ - long f_spare[2]; /* spare for later */ - char f_fstypename[MFSNAMELEN];/* fs type name */ - char f_mntonname[MNAMELEN];/* directory on which mounted */ - char f_mntfromname[MNAMELEN];/* mounted file system */ -}; -.Ed -.Pp -The flags that may be returned include: -.Bl -tag -width MNT_ASYNCHRONOUS -.It Dv MNT_RDONLY -The file system is mounted read-only; -Even the super-user may not write on it. -.It Dv MNT_NOEXEC -Files may not be executed from the file system. -.It Dv MNT_NOSUID -Setuid and setgid bits on files are not honored when they are executed. -.It Dv MNT_NODEV -Special files in the file system may not be opened. -.It Dv MNT_SYNCHRONOUS -All I/O to the file system is done synchronously. -.It Dv MNT_ASYNCHRONOUS -No file system I/O is done synchronously. -.It Dv MNT_LOCAL -The file system resides locally. -.It Dv MNT_QUOTA -The file system has quotas enabled on it. -.It Dv MNT_ROOTFS -Identifies the root file system. -.It Dv MNT_EXRDONLY -The file system is exported read-only. -.It Dv MNT_EXPORTED -The file system is exported for both reading and writing. -.It Dv MNT_DEFEXPORTED -The file system is exported for both reading and writing to any Internet host. -.It Dv MNT_EXPORTANON -The file system maps all remote accesses to the anonymous user. -.It Dv MNT_EXKERB -The file system is exported with Kerberos uid mapping. -.El +structures, as described in +.Xr statfs 2 . .Pp Fields that are undefined for a particular file system are set to -1. The buffer is filled with an array of ==== //depot/projects/hammer/lib/libc/sys/setgroups.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setgroups.2 8.2 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.12 2003/09/10 19:24:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.13 2003/11/19 13:05:50 dds Exp $ .\" .Dd April 16, 1994 .Dt SETGROUPS 2 @@ -71,6 +71,12 @@ .Bl -tag -width Er .It Bq Er EPERM The caller is not the super-user. +.It Bq Er EINVAL +The number specified in the +.Fa ngroups +argument is larger than the +.Dv NGROUPS +limit. .It Bq Er EFAULT The address specified for .Fa gidset ==== //depot/projects/hammer/libexec/tftpd/tftpd.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.27 2003/04/19 10:14:43 billf Exp $"; + "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.28 2003/11/20 13:36:31 sobomax Exp $"; #endif /* not lint */ /* @@ -364,8 +364,9 @@ int i, first = 1, has_options = 0, ecode; struct formats *pf; char *filename, *mode, *option, *ccp; + char fnbuf[MAXPATHLEN]; - filename = cp = tp->th_stuff; + cp = tp->th_stuff; again: while (cp < buf + size) { if (*cp == '\0') @@ -376,6 +377,14 @@ nak(EBADOP); exit(1); } + i = cp - tp->th_stuff; + if (i >= sizeof(fnbuf)) { + nak(EBADOP); + exit(1); + } + memcpy(fnbuf, tp->th_stuff, i); + fnbuf[i] = '\0'; + filename = fnbuf; if (first) { mode = ++cp; first = 0; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#47 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.652 2003/11/16 20:34:46 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.655 2003/11/21 01:23:20 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -176,6 +176,12 @@ <sect2 id="kernel"> <title>Kernel Changes</title> + <para arch="i386,ia64,amd64">The &man.acpi.4; driver's CPU + component now supports idle states C1-C3 for both single and SMP + systems, providing power/heat savings when the processor is + idle, according to ACPI 2.0. Additionally, the throttling + support has been updated to ACPI 2.0.</para> + <para arch="i386">A bug that caused &man.atkbd.4; to register an AT keyboard during console initialization, even when no AT keyboard was connected, @@ -228,6 +234,12 @@ <para>The public key support is not implemented.</para> </note></para> + <para arch="sparc64">The &man.syscons.4; driver now has support + for &os;/sparc64. Installation on the system console should now + be supported, and systems with Creator3D graphics cards + (e.g. Ultra 30) can now run + <application>XFree86</application>.</para> + <para>A kernel software watchdog facility has been implemented. For more information, see &man.watchdog.4; and &man.watchdogd.8;.</para> @@ -332,9 +344,9 @@ <para>The 802.11 support layer has been rewritten to allow for future growth and new features.</para> - <para>The xe driver now supports CE2, CEM28, + <para>The &man.xe.4; driver now supports CE2, CEM28, and CEM33 cards, and &man.multicast.4; datagram. Also several - bugs in the driver has been fixed.</para> + bugs in the driver have been fixed.</para> <para>A number of network drivers have had their interrupt handlers marked as MPSAFE, meaning they can run without @@ -390,7 +402,7 @@ <itemizedlist> <listitem> <para><application>libsdp</application> has been re-implemented - under BSD style license. This is because the Linux BlueZ's code is + under BSD style license. This is because the Linux BlueZ code is distributed under GPL.</para> </listitem> @@ -405,9 +417,9 @@ </listitem> <listitem> - <para>A netgraph timeouts problem in &man.ng.hci.4; and + <para>A netgraph timeout problem in &man.ng.hci.4; and &man.ng.l2cap.4; kernel modules, which could cause - access to data structure that was already freed, + access to a data structure that was already freed, has been fixed.</para> </listitem> @@ -418,13 +430,13 @@ <listitem> <para>&man.rfcomm.sppd.1; and &man.rfcomm.pppd.8; now support - to query RFCOMM channel via SDP from the server. Specifying - RFCOMM channel manually, this behavior can be disabled and + to query the RFCOMM channel via SDP from the server. Specifying + the RFCOMM channel manually, this behavior can be disabled and these utilities will not use SDP query.</para> </listitem> <listitem> - <para>&man.sdpcontrol.8; utility, which is analogous to sdptool utility in + <para>&man.sdpcontrol.8; utility, which is analogous to the sdptool utility in the Linux BlueZ SDP package, has been added.</para> </listitem> </itemizedlist> @@ -630,7 +642,7 @@ to be unmounted even when two or more file systems share the same device and mount point names.</para> - <para>The &man.mount.cd9660.8; and &man.mount.ntfs.8; utilities + <para>The &man.mount.cd9660.8;, &man.mount.ntfs.8;, and &man.mount.udf.8; utilities now support a <option>-C</option> option to specify local character sets to convert Unicode filenames. It is possible to specify multi-byte character sets using this option.</para> ==== //depot/projects/hammer/sbin/Makefile.inc#5 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/8/93 -# $FreeBSD: src/sbin/Makefile.inc,v 1.11 2003/11/16 04:57:28 gordon Exp $ +# $FreeBSD: src/sbin/Makefile.inc,v 1.12 2003/11/19 16:59:00 marcel Exp $ BINDIR?= /sbin WARNS?= 2 -.if defined(NO_DYNAMICROOT) +.if defined(NO_DYNAMICROOT) || ${MACHINE_ARCH} == "ia64" NOSHARED?= YES .endif ==== //depot/projects/hammer/sbin/dump/dump.8#8 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dump.8 8.3 (Berkeley) 5/1/95 -.\" $FreeBSD: src/sbin/dump/dump.8,v 1.60 2003/11/05 22:17:37 kensmith Exp $ +.\" $FreeBSD: src/sbin/dump/dump.8,v 1.61 2003/11/18 00:36:40 mckusick Exp $ .\" .Dd March 1, 2002 .Dt DUMP 8 @@ -210,9 +210,20 @@ that it is dumping a live file system. To obtain a consistent dump image, .Nm -takes a snapshot of the file system and +takes a snapshot of the file system in the +.Pa .snap +directory in the root of the filesystem being dumped and then does a dump of the snapshot. The snapshot is removed when the dump is complete. +If the +.Pa .snap +directory does not exist in the root of the filesystem being dumped, +the dump will fail. +This problem can be corrected by creating a +.Pa .snap +directory in the root of the filesystem to be dumped; +its owner should be root, its group should be operator, +and its mode should be 0770. .It Fl n Whenever .Nm ==== //depot/projects/hammer/sbin/init/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/sbin/init/Makefile,v 1.27 2001/12/04 02:19:48 obrien Exp $ +# $FreeBSD: src/sbin/init/Makefile,v 1.28 2003/11/19 19:57:20 gordon Exp $ PROG= init MAN= init.8 @@ -11,4 +11,6 @@ DPADD= ${LIBUTIL} ${LIBCRYPT} LDADD= -lutil -lcrypt +NOSHARED?= YES + .include <bsd.prog.mk> ==== //depot/projects/hammer/share/man/man4/Makefile#27 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.240 2003/11/14 20:29:12 bms Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.241 2003/11/21 00:55:11 trhodes Exp $ MAN= aac.4 \ acpi.4 \ @@ -141,6 +141,7 @@ natm.4 \ natmip.4 \ ncr.4 \ + ncv.4 \ netgraph.4 \ netintro.4 \ ng_atm.4 \ ==== //depot/projects/hammer/share/man/man4/acpi.4#14 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.17 2003/11/15 19:26:05 njl Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.20 2003/11/19 20:37:15 njl Exp $ .\" .Dd July 2, 2001 .Dt ACPI 4 @@ -310,17 +310,17 @@ .It Va hint.acpi.0.disabled Disables all of ACPI. .It Va hw.acpi.ec.poll_timeout -Delay in milliseconds to wait for the EC to respond. Try increasing this -number if you get the error +Delay in milliseconds to wait for the EC to respond. +Try increasing this number if you get the error .Er AE_NO_HARDWARE_RESPONSE . -.It Va hw.acpi.no_reset_video -Disables calling the VESA reset BIOS vector on the resume path. Some -graphic chips have problems such as LCD white-out after resume. Try -setting this to 1 if necessary. +.It Va hw.acpi.reset_video +Enables calling the VESA reset BIOS vector on the resume path. +Some graphic chips have problems such as LCD white-out after resume. +Try setting this to 0 if this causes problems for you. .It Va hw.acpi.os_name Some systems' ASL may have problems because they look for names -of Microsoft operating systems. This tunable overrides the -default value of "FreeBSD". +of Microsoft operating systems. +This tunable overrides the default value of "FreeBSD". .It Va hw.acpi.pci.link.%d.%d.%d.irq Override the interrupt to use. .It Va hw.acpi.verbose @@ -342,13 +342,20 @@ is modified. .It Va hw.acpi.cpu.cx_lowest Zero-based index of the lowest CPU idle state to use. -A value of -1 disables ACPI CPU idle states. +A scheduling algorithm will select between 0...index for the state +to use during the next sleep. To enable ACPI CPU idling control, .Va machdep.cpu_idle_hlt must be set to 1. .It Va hw.acpi.cpu.cx_supported List of supported CPU idle states and their transition latency in microseconds. +Each state has a type, C1-3. +C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper +sleep with the same semantics, and C3 provides the deepest sleep +but additionally requires bus mastering to be disabled. +Deeper sleeps provide more power savings but increased transition +latency when an interrupt occurs. .El .Sh COMPATIBILITY ACPI is only found and supported on i386/ia32, ia64, and amd64. @@ -364,7 +371,7 @@ .%A "Microsoft Corporation" .%A "Phoenix Technologies Ltd." .%A "Toshiba Corporation" -.%D July 27 2000 +.%D August 25, 2003 .%T "Advanced Configuration and Power Interface Specification" .%O http://acpi.info/spec.htm .Re ==== //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.51 2003/07/05 12:38:17 ache Exp $ +# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.52 2003/11/20 20:41:12 jhb Exp $ # # database for kbdmap(8) # @@ -165,7 +165,7 @@ gr.elot.acc.kbd:el:Ελληνικό ISO-8859-7 ΕΛΟΤ gr.us101.acc.kbd:en:Greek ISO-8859-7 (101 keys) -gr.us101.acc.kbd:en:Ελληνικό ISO-8859-7 (101 πλήκτρων) +gr.us101.acc.kbd:el:Ελληνικό ISO-8859-7 (101 πλήκτρων) iw.iso8.kbd:en:Hebrew ISO-8859-8 iw.iso8.kbd:he:ISO-8859-8 ϊιψας ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#10 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 + * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.176 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.177 2003/11/21 03:01:59 peter Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#27 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)genassym.c 5.11 (Berkeley) 5/10/91 + * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.150 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.151 2003/11/21 03:01:59 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * Copyright (c) 1997 KATO Takenori. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.127 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) KATO Takenori, 1997, 1998. * * All rights reserved. Unpublished rights reserved under the copyright @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.52 2003/11/21 03:01:59 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#71 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.599 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -121,6 +121,9 @@ #include <sys/ptrace.h> #include <machine/sigframe.h> +/* Sanity check for __curthread() */ +CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); + extern u_int64_t hammer_time(u_int64_t, u_int64_t); extern void dblfault_handler(void); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.226 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.227 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -130,7 +130,7 @@ } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; -static u_int boot_address; +static u_int boot_address; static void set_logical_apic_ids(void); static int start_all_aps(void); ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.56 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -135,6 +135,7 @@ static int nexus_probe(device_t dev) { + int irq, last; device_quiet(dev); /* suppress attach message for neatness */ @@ -160,12 +161,27 @@ irq_rman.rm_type = RMAN_ARRAY; irq_rman.rm_descr = "Interrupt request lines"; irq_rman.rm_end = NUM_IO_INTS - 1; - if (rman_init(&irq_rman) - || rman_manage_region(&irq_rman, - irq_rman.rm_start, irq_rman.rm_end)) + if (rman_init(&irq_rman)) panic("nexus_probe irq_rman"); /* + * We search for regions of existing IRQs and add those to the IRQ + * resource manager. + */ + last = -1; + for (irq = 0; irq < NUM_IO_INTS; irq++) + if (intr_lookup_source(irq) != NULL) { + if (last == -1) + last = irq; + } else if (last != -1) { + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + last = -1; + } + if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + + /* * ISA DMA on PCI systems is implemented in the ISA part of each * PCI->ISA bridge and the channels can be duplicated if there are * multiple bridges. (eg: laptops with docking stations) ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#45 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.446 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#11 (text+ko) ==== @@ -31,11 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 + * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.86 2003/11/08 04:39:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.87 2003/11/21 03:01:59 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#34 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)trap.c 7.4 (Berkeley) 5/13/91 + * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.270 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.271 2003/11/21 03:01:59 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#20 (text+ko) ==== @@ -36,12 +36,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.223 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.224 2003/11/21 03:02:00 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#25 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.397 2003/11/08 03:17:36 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.399 2003/11/21 03:19:59 peter Exp $ machine amd64 cpu HAMMER @@ -25,7 +25,7 @@ #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_MODULES=not_yet options SCHED_4BSD #4BSD scheduler @@ -64,6 +64,12 @@ options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel +# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150) +device atpic # 8259A compatability +options NO_MIXED_MODE # Don't penalize working chipsets + device acpi device isa >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311211830.hALIUpw4002200>