Date: Sat, 13 Mar 2004 23:07:35 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48957 for review Message-ID: <200403140707.i2E77ZgJ013832@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48957 Change 48957 by jmallett@jmallett_oingo on 2004/03/13 23:06:37 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#24 integrate .. //depot/projects/mips/etc/devd.conf#7 integrate .. //depot/projects/mips/games/number/number.c#2 integrate .. //depot/projects/mips/lib/libkiconv/xlat16_iconv.c#3 integrate .. //depot/projects/mips/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/mips/libexec/getty/chat.c#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate .. //depot/projects/mips/sbin/Makefile#15 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#13 integrate .. //depot/projects/mips/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/mips/share/man/man4/uscanner.4#8 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#10 integrate .. //depot/projects/mips/share/mk/bsd.lib.mk#7 integrate .. //depot/projects/mips/sys/alpha/alpha/busdma_machdep.c#11 integrate .. //depot/projects/mips/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/mips/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/mips/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/mips/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/mips/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/mips/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/mips/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/mips/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/mips/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/mips/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/mips/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/mips/sys/conf/files.i386#21 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/mips/sys/conf/kmod.mk#14 integrate .. //depot/projects/mips/sys/conf/options.amd64#5 integrate .. //depot/projects/mips/sys/dev/ct/bshw_machdep.c#3 integrate .. //depot/projects/mips/sys/dev/ct/ct.c#3 integrate .. //depot/projects/mips/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/mips/sys/dev/md/md.c#21 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500.c#3 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/mips/sys/dev/nsp/nsp.c#3 integrate .. //depot/projects/mips/sys/dev/nsp/nsp_pccard.c#4 integrate .. //depot/projects/mips/sys/dev/stg/tmc18c30.c#4 integrate .. //depot/projects/mips/sys/dev/stg/tmc18c30_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#19 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#19 integrate .. //depot/projects/mips/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#22 integrate .. //depot/projects/mips/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/mips/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/mips/sys/i386/include/dvcfg.h#2 delete .. //depot/projects/mips/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/mips/sys/i386/include/physio_proc.h#3 delete .. //depot/projects/mips/sys/i386/include/wtio.h#2 delete .. //depot/projects/mips/sys/i386/isa/asc.c#6 delete .. //depot/projects/mips/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/ctx.c#7 delete .. //depot/projects/mips/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/gpib.c#9 delete .. //depot/projects/mips/sys/i386/isa/gpib.h#2 delete .. //depot/projects/mips/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/wt.c#7 delete .. //depot/projects/mips/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/mips/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/mips/sys/kern/init_sysent.c#14 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#22 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#21 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#24 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#24 integrate .. //depot/projects/mips/sys/kern/subr_param.c#3 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#18 integrate .. //depot/projects/mips/sys/kern/sys_generic.c#9 integrate .. //depot/projects/mips/sys/kern/syscalls.c#14 integrate .. //depot/projects/mips/sys/kern/syscalls.master#17 integrate .. //depot/projects/mips/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/mips/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/mips/sys/net/if.c#12 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/mips/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/mips/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/mips/sys/net/if_tapvar.h#3 integrate .. //depot/projects/mips/sys/net/if_tun.c#13 integrate .. //depot/projects/mips/sys/net/if_var.h#7 integrate .. //depot/projects/mips/sys/netatalk/aarp.c#8 integrate .. //depot/projects/mips/sys/netinet/if_ether.c#9 integrate .. //depot/projects/mips/sys/netncp/ncp_subr.c#6 integrate .. //depot/projects/mips/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/mips/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/mips/sys/pci/agp_intel.c#7 integrate .. //depot/projects/mips/sys/powerpc/powerpc/busdma_machdep.c#12 integrate .. //depot/projects/mips/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/mips/sys/sparc64/sparc64/bus_machdep.c#12 integrate .. //depot/projects/mips/sys/sys/eventhandler.h#6 integrate .. //depot/projects/mips/sys/sys/socket.h#9 integrate .. //depot/projects/mips/sys/sys/syscall.h#14 integrate .. //depot/projects/mips/sys/sys/syscall.mk#14 integrate .. //depot/projects/mips/sys/sys/sysproto.h#16 integrate .. //depot/projects/mips/sys/vm/vm_contig.c#10 integrate .. //depot/projects/mips/tools/tools/nanobsd/i386.diskimage#2 integrate .. //depot/projects/mips/usr.bin/Makefile#15 integrate .. //depot/projects/mips/usr.bin/finger/finger.c#4 integrate .. //depot/projects/mips/usr.bin/mkstr/mkstr.c#3 integrate .. //depot/projects/mips/usr.bin/sasc/INSTALL#2 delete .. //depot/projects/mips/usr.bin/sasc/Makefile#2 delete .. //depot/projects/mips/usr.bin/sasc/README#2 delete .. //depot/projects/mips/usr.bin/sasc/sasc.1#2 delete .. //depot/projects/mips/usr.bin/sasc/sasc.c#2 delete .. //depot/projects/mips/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/mips/usr.sbin/Makefile#18 integrate .. //depot/projects/mips/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/nologin/nologin.c#2 integrate .. //depot/projects/mips/usr.sbin/ntp/doc/ntp.conf.5#4 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.415 2004/03/12 13:24:17 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -585,6 +585,15 @@ @echo "ERROR: No kernel \"${KERNCONF}\" to install." false .endif + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; \ + ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} ==== //depot/projects/mips/etc/devd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.11 2004/02/03 04:18:55 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -31,7 +31,7 @@ # # For ethernet like devices, the default is to run dhclient. Due to -# a historical accident, the name of this script it called pccard_ether +# a historical accident, this script is called pccard_ether. # attach 0 { device-name "$ethernet-nic-regex"; ==== //depot/projects/mips/games/number/number.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/games/number/number.c,v 1.13 2002/02/18 05:15:16 imp Exp $"; + "$FreeBSD: src/games/number/number.c,v 1.14 2004/03/14 05:28:29 bde Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -133,7 +133,7 @@ int flen, len, rval; char *p, *fraction; - flen = NULL; + flen = 0; fraction = NULL; for (p = line; *p != '\0' && *p != '\n'; ++p) { if (isblank(*p)) { ==== //depot/projects/mips/lib/libkiconv/xlat16_iconv.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.2 2003/12/08 08:32:19 fjoe Exp $ + * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.3 2004/03/14 05:14:00 bde Exp $ */ /* @@ -146,8 +146,8 @@ xt.data = NULL; xt.size = 0; - src[2] = NULL; - dst[3] = NULL; + src[2] = '\0'; + dst[3] = '\0'; ret = my_iconv_init(); if (ret) ==== //depot/projects/mips/lib/libncp/ncpl_nls.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.4 2002/04/20 05:35:02 bp Exp $"); +__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.5 2004/03/14 05:19:38 bde Exp $"); /* * Languages support. Currently is very primitive. @@ -228,7 +228,7 @@ {NCP_NLS_SE, NCP_NLS_SE_NAME, {def2lower, def2upper, se_nw2unix, se_unix2nw, 0} }, - {NULL, 0} + {0} }; struct ncp_nlstables ncp_nls; ==== //depot/projects/mips/lib/libpthread/thread/thr_concurrency.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.7 2003/08/30 12:09:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ */ #include <errno.h> #include <pthread.h> @@ -157,7 +157,7 @@ int ret; len = sizeof(vcpu); - ret = sysctlbyname("kern.threads.virtual_cpu", &vcpu, &len, NULL, NULL); + ret = sysctlbyname("kern.threads.virtual_cpu", &vcpu, &len, NULL, 0); if (ret == 0 && vcpu > 0) ret = _thr_setconcurrency(vcpu); return (ret); ==== //depot/projects/mips/libexec/getty/chat.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/libexec/getty/chat.c,v 1.9 2002/12/30 21:18:03 schweikh Exp $"; + "$FreeBSD: src/libexec/getty/chat.c,v 1.10 2004/03/14 05:27:26 bde Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -355,7 +355,7 @@ /* See if we can resync on a * partial match in our buffer */ - while (j < i && memcmp(got + j, str, i - j) != NULL) + while (j < i && memcmp(got + j, str, i - j) != 0) j++; if (j < i) memcpy(got, got + j, i - j); ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 (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.686 2004/03/04 17:06:30 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.688 2004/03/13 16:45:05 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -144,7 +144,7 @@ has been fixed. This error could allow a process with superuser privileges inside a &man.jail.8; environment to change its root directory to that of a different jail, and thus gain full read - and write acecss to files and directories within the target + and write access to files and directories within the target jail. More information can be found in security advisory <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.jail.asc">FreeBSD-SA-04:03</ulink>.</para>; @@ -195,6 +195,21 @@ <para>The kernel's file descriptor allocation code has been updated, and is now derived from similar code in OpenBSD.</para> + <para arch="sparc64">On &os;/sparc64 <varname>time_t</varname> + has been changed from a 32-bit value to a 64-bit value. + + <note> + <para>Since this change is not backward-compatible, + any programs which are built on the older system using + the 32-bit <varname>time_t</varname> as well as + call system-routines for handling + <varname>time_t</varname> values, will have to be recompiled. + More detail information and notice on upgrading from + the source can be found in + <filename>/usr/src/UPDATING.64BTT</filename>.</para> + </note> + </para> + <!-- Above this line, sort kernel changes by manpage/keyword--> <sect3 id="proc"> @@ -232,6 +247,9 @@ driver has been removed due to breakage. Its functionality has been subsumed into the &man.en.4; driver.</para> + <para>A short hiccup in the &man.em.4; during parameter + reconfiguration, has been fixed. &merged;</para> + <para arch="i386">The lmc (LAN Media Corp. PCI WAN adapter) driver has been removed due to breakage and lack of maintainership.</para> @@ -246,6 +264,9 @@ For more information, see the &man.ndis.4; and &man.ndiscvt.8; manual pages.</para> + <para>The &man.ng.vlan.4; NetGraph node type, which supports + IEEE 802.1Q VLAN tagging has been added. &merged;</para> + <para>Several bugs related to multicast and promiscuous mode handling in the &man.sk.4; driver have been fixed.</para> @@ -295,7 +316,6 @@ for authenticating TCP sessions. &man.setkey.8; now includes support for the TCP-MD5 class of security associations. &merged;</para> - </sect3> <sect3 id="disks"> @@ -306,6 +326,8 @@ work better, and some problems with timeouts should be resolved.</para> + <para>The &man.umass.4; driver now supports the missing + ATAPI MMC commands and handles the timeout properly.</para> </sect3> <sect3 id="fs"> @@ -339,6 +361,16 @@ if the server requires it; this may eventually become an option to &man.mount.smbfs.8;.</para> + <para>A support for gbde-enabled swap devices has been added. + When <varname>gbde_swap_enable</varname> is specified + in &man.rc.conf.5;, a swap device named + <filename>/dev/foo.bde</filename> in &man.fstab.5; + is automatically attached at boot time with the device + <filename>/dev/foo</filename> and a random key, which + generated by computing the MD5 checksum of 512 bytes read + from <filename>/dev/random</filename>. + Note that this prevents recovery of kernel dumps.</para> + </sect3> <sect3 id="mm"> @@ -412,11 +444,18 @@ </note> <para> + <para>&man.mountd.8; now supports the <option>-p</option> option, + which allows users to specify a known port for use + in firewall rulesets.</para> + <para>&man.newfs.8; and &man.mdmfs.8; now support a <option>-l</option> flag to enable them to set the MAC multilabel flag on new filesystems without requiring the use of &man.tunefs.8;.</para> + <para>&man.nologin.8; now support reporting login attempts via + &man.syslogd.8;.</para> + <para>A bugfix has been applied to NSS support, which fixes problems when using third-party NSS modules (such as <filename role="package">net/nss_ldap</filename>) and groups with large @@ -507,6 +546,31 @@ </para> + <para><application>pf</application>, OpenBSD's packet filter as of + OpenBSD 3.4 has been imported into &os; source tree and installed + by default. A new user <username>proxy</username>, and two new + groups <username>authpf</username> and <username>proxy</username>, + which <application>pf</application> needs are added as well. + + <note> + <para>On upgrading from the source, these user accounts must be + added in advance. And, the <varname>NO_PF</varname> variable + in <filename>make.conf</filename> can be used to prevent + <application>pf</application> from building.</para> + </note> + + <para>Several userland utilities of OpenBSD's + <application>pf</application> have been imported. + <filename>libexec/ftp-proxy</filename> is an ftp proxy for + <application>pf</application>, + <filename>sbin/pfctl</filename> is an equivalent to + <filename>sbin/ipf</filename>, + <filename>sbin/pflogd</filename> + is a daemon logging packets via <literal>if_pflog</literal> + in pcap format, and + <filename>usr.sbin/authpf</filename> is an authentication shell + to modify pf rulesets.</para> + <para><application>routed</application> has been updated from release 2.22 to release 2.27 from rhyolite.com. Note that for users relying on RIP's MD5 authentication feature, @@ -522,8 +586,14 @@ <sect2 id="ports"> <title>Ports/Packages Collection Infrastructure</title> - <para></para> - + <para>The <literal>SIZE</literal> attribute for distfiles + which can be used for checking file size before fetching, + has been added and enabled by default. + <varname>DISABLE_SIZE</varname> is a user control knob + to disable the distfile size checking. This is especially + useful on old &os; versions which didn't have &man.fetch.1; + support for this, and for some FTP proxies which always + report incorrect or bogus size.</para> </sect2> <sect2 id="releng"> ==== //depot/projects/mips/sbin/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.135 2004/03/08 22:03:28 mlaier Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.136 2004/03/13 11:02:37 cperciva Exp $ # XXX MISSING: icheck ncheck @@ -68,7 +68,6 @@ newfs \ newfs_msdos \ nfsiod \ - nologin \ nos-tun \ ${_pfctl} \ ${_pflogd} \ ==== //depot/projects/mips/share/man/man4/man4.i386/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.158 2004/03/03 13:26:18 rik Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.160 2004/03/14 05:01:04 imp Exp $ MAN= acpi_toshiba.4 \ aic.4 \ @@ -6,7 +6,6 @@ amdpm.4 \ apm.4 \ ar.4 \ - asc.4 \ CPU_ELAN.4 \ cs.4 \ ct.4 \ @@ -45,8 +44,7 @@ vpd.4 \ vx.4 \ wd.4 \ - wl.4 \ - wt.4 + wl.4 MLINKS= CPU_ELAN.4 CPU_SOEKRIS.4 MLINKS+=ct.4 ctau.4 ==== //depot/projects/mips/share/man/man4/uscanner.4#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.12 2004/02/20 09:54:32 wilko Exp $ +.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.13 2004/03/13 13:54:07 simon Exp $ .\" .Dd October 26, 2000 .Dt USCANNER 4 @@ -79,6 +79,7 @@ .It Epson Perfection 1640SU .It Epson Perfection 1650 .It Epson Perfection 1660 +.It Epson Perfection 1670 .It Epson Perfection 3200 .It Epson GT-9300UF .It Epson GT-9700F ==== //depot/projects/mips/share/mk/bsd.cpu.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.34 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.35 2004/03/14 01:29:05 trhodes Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -44,7 +44,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ - ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" + ${CPUTYPE} == "athlon-4" _ICC_CPUCFLAGS = -tpp6 -xiMK _CPUCFLAGS = -march=${CPUTYPE} . elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" ==== //depot/projects/mips/share/mk/bsd.lib.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.157 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.158 2004/03/14 01:29:05 trhodes Exp $ # .include <bsd.init.mk> @@ -54,9 +54,6 @@ PO_FLAG=-pg .endif -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -166,7 +163,7 @@ ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.endif #!defined(INTERNALLIB) +.endif !defined(INTERNALLIB) all: ${_LIBS} ==== //depot/projects/mips/sys/alpha/alpha/busdma_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/mips/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/mips/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -754,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -769,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -807,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/mips/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/mips/sys/amd64/include/pci_cfgreg.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/mips/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> -#include <sys/module.h> #include <sys/malloc.h> #include <dev/pci/pcivar.h> @@ -42,9 +41,6 @@ #include <isa/isavar.h> #include <machine/legacyvar.h> #include <machine/pci_cfgreg.h> -#include <machine/segments.h> -#include <machine/cputypes.h> -#include <machine/md_var.h> #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00091166: - s = "ServerWorks NB6635 3.0LE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00101166: - s = "ServerWorks CIOB30 host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00111166: - /* FALLTHROUGH */ - case 0x03021014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks CMIC-HE host to PCI-X bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* XXX unknown chipset, but working */ - case 0x00171166: - /* FALLTHROUGH */ - case 0x01011166: - s = "ServerWorks host to PCI bridge(unknown chipset)"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* Integrated Micro Solutions -- vendor 0x10e0 */ - case 0x884910e0: - s = "Integrated Micro Solutions VL Bridge"; - break; - - default: - if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) - s = "Host to PCI bridge"; - break; - } - + if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) + s = "Host to PCI bridge"; return s; } @@ -432,9 +228,10 @@ int legacy_pcib_attach(device_t dev) { + int bus; - device_add_child(dev, "pci", pcib_get_bus(dev)); - + bus = pcib_get_bus(dev); + device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } ==== //depot/projects/mips/sys/amd64/pci/pci_cfgreg.c#5 (text+ko) ==== @@ -27,26 +27,17 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $"); -#include <sys/param.h> /* XXX trim includes */ +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <sys/malloc.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <vm/vm.h> -#include <vm/pmap.h> -#include <machine/md_var.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <isa/isavar.h> #include <machine/pci_cfgreg.h> -#include "pcib_if.h" - static int cfgmech; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403140707.i2E77ZgJ013832>