From owner-p4-projects@FreeBSD.ORG Sun May 8 19:41:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46F1416A4E8; Sun, 8 May 2005 19:41:55 +0000 (GMT) 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 1EA1716A4E6 for ; Sun, 8 May 2005 19:41:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E37D843D88 for ; Sun, 8 May 2005 19:41:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j48JfsSQ092065 for ; Sun, 8 May 2005 19:41:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j48JfspL092062 for perforce@freebsd.org; Sun, 8 May 2005 19:41:54 GMT (envelope-from marcel@freebsd.org) Date: Sun, 8 May 2005 19:41:54 GMT Message-Id: <200505081941.j48JfspL092062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 76703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 May 2005 19:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=76703 Change 76703 by marcel@marcel_nfs on 2005/05/08 19:41:42 IFC @76698 Affected files ... .. //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 integrate .. //depot/projects/tty/lib/libc/gmon/mcount.c#4 integrate .. //depot/projects/tty/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/tty/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/tty/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/tty/libexec/talkd/process.c#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/tty/release/doc/share/sgml/release.dsl#4 integrate .. //depot/projects/tty/share/examples/etc/make.conf#13 integrate .. //depot/projects/tty/share/examples/mdoc/example.4#4 integrate .. //depot/projects/tty/share/man/man4/Makefile#15 integrate .. //depot/projects/tty/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/tty/share/man/man4/man4.i386/acpi_ibm.4#1 branch .. //depot/projects/tty/share/man/man4/ng_nat.4#1 branch .. //depot/projects/tty/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/Makefile#8 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/disk.c#5 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/io.c#4 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/sys.c#5 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/table.c#3 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btx/Makefile#4 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btxldr/Makefile#4 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/tty/sys/boot/pc98/kgzldr/Makefile#5 integrate .. //depot/projects/tty/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/comconsole.c#3 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/gatea20.c#3 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/time.c#3 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/vidconsole.c#5 integrate .. //depot/projects/tty/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/tty/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/tty/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/tty/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/tty/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/tty/sys/compat/ndis/subr_hal.c#6 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/tty/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/tty/sys/conf/NOTES#20 integrate .. //depot/projects/tty/sys/conf/files#25 integrate .. //depot/projects/tty/sys/conf/options#19 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/tty/sys/dev/digi/CX.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/tty/sys/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/tty/sys/dev/iir/iir_ctrl.c#10 integrate .. //depot/projects/tty/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/tty/sys/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_subr.c#6 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/tty/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/tty/sys/kern/kern_exit.c#14 integrate .. //depot/projects/tty/sys/kern/subr_bus.c#11 integrate .. //depot/projects/tty/sys/kern/subr_rman.c#9 integrate .. //depot/projects/tty/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/tty/sys/modules/Makefile#19 integrate .. //depot/projects/tty/sys/modules/libalias/Makefile#1 branch .. //depot/projects/tty/sys/modules/netgraph/Makefile#8 integrate .. //depot/projects/tty/sys/modules/netgraph/nat/Makefile#1 branch .. //depot/projects/tty/sys/net/if_mib.c#4 integrate .. //depot/projects/tty/sys/netgraph/ng_nat.c#1 branch .. //depot/projects/tty/sys/netgraph/ng_nat.h#1 branch .. //depot/projects/tty/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/tty/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/tty/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/tty/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/tty/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/tty/sys/sys/diskpc98.h#6 integrate .. //depot/projects/tty/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/tty/sys/sys/param.h#17 integrate .. //depot/projects/tty/tools/regression/lib/libc/resolv/resolv.t#1 branch .. //depot/projects/tty/tools/regression/net80211/ccmp/test_ccmp.c#2 integrate .. //depot/projects/tty/tools/regression/net80211/tkip/test_tkip.c#2 integrate .. //depot/projects/tty/tools/regression/net80211/wep/test_wep.c#2 integrate .. //depot/projects/tty/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/tty/usr.bin/make/main.c#10 integrate .. //depot/projects/tty/usr.bin/make/parse.c#7 integrate .. //depot/projects/tty/usr.bin/make/var.c#7 integrate .. //depot/projects/tty/usr.bin/make/var.h#4 integrate .. //depot/projects/tty/usr.bin/tar/Makefile#6 integrate .. //depot/projects/tty/usr.bin/tar/tree.c#2 integrate .. //depot/projects/tty/usr.bin/tar/tree.h#2 integrate .. //depot/projects/tty/usr.bin/tar/write.c#6 integrate .. //depot/projects/tty/usr.sbin/ppp/ppp.8.m4#11 integrate .. //depot/projects/tty/usr.sbin/sysinstall/menus.c#16 integrate Differences ... ==== //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipmon.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipmon.c,v 1.3 2005/05/08 00:29:15 grehan Exp $ */ /* * Copyright (C) 1993-2001, 2003 by Darren Reed. @@ -1024,7 +1024,7 @@ (void) sprintf(t, "%*.*s%u", len, len, ipf->fl_ifname, ipf->fl_unit); t += strlen(t); #endif -#ifdef __sgi +#if (defined(__sgi) || defined(__powerpc__)) if ((ipf->fl_group[0] == 255) && (ipf->fl_group[1] == '\0')) #else if ((ipf->fl_group[0] == -1) && (ipf->fl_group[1] == '\0')) ==== //depot/projects/tty/games/fortune/datfiles/limerick#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.7 2005/02/01 16:34:38 ru Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.8 2005/05/07 17:56:50 schweikh Exp $ A bad little girl in Madrid, A most reprehensible kid, Told her Tante Louise @@ -3438,18 +3438,13 @@ Who had an affair with a eunuch. At the height of their passion He dealt her a ration -% -There was a young lady from Munich -Who had an affair with a eunuch. - At the height of their passion - He dealt her a ration From a squirt gun concealed in his tunic. % There was a young lady from Norway Who hung by her heels in a doorway. She told her young man, "Get off the divan, -I think I've discovered one more way " +I think I've discovered one more way" % There was a young lady from Prentice Who had an affair with a dentist. @@ -3578,7 +3573,7 @@ Of Mozart's quartet in F major. % There was a young lady named Ciss -Who said, "I think skating's a bliss " +Who said, "I think skating's a bliss" But she'll never restate, For a wheel off her skate .siht ekil gnihtemos pu hsinif reh edaM @@ -4509,7 +4504,7 @@ Whose lovemaking was rather brisk. So quick was his action, The Lorentz Contraction -Shortened his rod to a disc !! +Shortened his rod to a disc! % There was a young plumber named Lee Who was plumbing his girl by the sea. ==== //depot/projects/tty/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.11 2005/04/12 03:04:04 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.12 2005/05/06 11:01:15 davidxu Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -660,6 +660,8 @@ if (! IS_THREAD(ptid)) return; + if (fbsd_thread_core != 0) + return; /* Enable thread event reporting for this thread. */ err = td_thr_event_enable_p (th_p, 1); if (err != TD_OK) ==== //depot/projects/tty/lib/libc/gmon/mcount.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.20 2004/10/16 06:32:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.21 2005/05/06 07:37:01 davidxu Exp $"); #include #include @@ -49,6 +49,7 @@ void eintr(void); void user(void); #endif +#include /* * mcount is called on entry to each function compiled with the profiling @@ -92,7 +93,8 @@ #ifdef _KERNEL MCOUNT_ENTER(s); #else - p->state = GMON_PROF_BUSY; + if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY)) + return; #endif frompci = frompc - p->lowpc; @@ -260,11 +262,11 @@ #ifdef _KERNEL MCOUNT_EXIT(s); #else - p->state = GMON_PROF_ON; + atomic_store_rel_int(&p->state, GMON_PROF_ON); #endif return; overflow: - p->state = GMON_PROF_ERROR; + atomic_store_rel_int(&p->state, GMON_PROF_ERROR); #ifdef _KERNEL MCOUNT_EXIT(s); #endif ==== //depot/projects/tty/lib/msun/i387/s_ceilf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $"); /* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */ ENTRY(ceilf) @@ -13,17 +13,17 @@ movl %esp,%ebp subl $8,%esp - fstcw -12(%ebp) /* store fpu control word */ - movw -12(%ebp),%dx + fstcw -4(%ebp) /* store fpu control word */ + movw -4(%ebp),%dx orw $0x0800,%dx /* round towards +oo */ andw $0xfbff,%dx - movw %dx,-16(%ebp) - fldcw -16(%ebp) /* load modfied control word */ + movw %dx,-8(%ebp) + fldcw -8(%ebp) /* load modfied control word */ flds 8(%ebp); /* round */ frndint - fldcw -12(%ebp) /* restore original control word */ + fldcw -4(%ebp) /* restore original control word */ leave ret ==== //depot/projects/tty/lib/msun/i387/s_floorf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $"); /* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */ ENTRY(floorf) @@ -13,17 +13,17 @@ movl %esp,%ebp subl $8,%esp - fstcw -12(%ebp) /* store fpu control word */ - movw -12(%ebp),%dx + fstcw -4(%ebp) /* store fpu control word */ + movw -4(%ebp),%dx orw $0x0400,%dx /* round towards -oo */ andw $0xf7ff,%dx - movw %dx,-16(%ebp) - fldcw -16(%ebp) /* load modfied control word */ + movw %dx,-8(%ebp) + fldcw -8(%ebp) /* load modfied control word */ flds 8(%ebp); /* round */ frndint - fldcw -12(%ebp) /* restore original control word */ + fldcw -4(%ebp) /* restore original control word */ leave ret ==== //depot/projects/tty/lib/msun/i387/s_truncf.S#2 (text+ko) ==== @@ -4,23 +4,23 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $") ENTRY(truncf) pushl %ebp movl %esp,%ebp subl $8,%esp - fstcw -12(%ebp) /* store fpu control word */ - movw -12(%ebp),%dx + fstcw -4(%ebp) /* store fpu control word */ + movw -4(%ebp),%dx orw $0x0c00,%dx /* round towards -oo */ - movw %dx,-16(%ebp) - fldcw -16(%ebp) /* load modfied control word */ + movw %dx,-8(%ebp) + fldcw -8(%ebp) /* load modfied control word */ flds 8(%ebp) /* round */ frndint - fldcw -12(%ebp) /* restore original control word */ + fldcw -4(%ebp) /* restore original control word */ leave ret ==== //depot/projects/tty/libexec/talkd/process.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)process.c 8.2 (Berkeley) 11/16/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/talkd/process.c,v 1.10 2002/02/05 21:06:56 imp Exp $"; + "$FreeBSD: src/libexec/talkd/process.c,v 1.11 2005/05/06 15:28:54 delphij Exp $"; #endif /* not lint */ /* @@ -62,11 +62,12 @@ #include "extern.h" +extern int debug; + void process_request(CTL_MSG *mp, CTL_RESPONSE *rp) { CTL_MSG *ptr; - extern int debug; char *s; rp->vers = TALK_VERSION; ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.852 2005/05/02 05:56:30 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.855 2005/05/07 13:46:20 brueffer Exp $ 2000 @@ -163,6 +163,28 @@ FreeBSD-SA-05:05.cvs. &merged; + An error in the default permissions on the /dev/iir device node, which + allowed unprivileged local users can send commands to the + hardware supported by the &man.iir.4; driver, has been fixed. + For more information, see security advisory + FreeBSD-SA-05:06.iir. + &merged; + + A bug in the validation of &man.i386.get.ldt.2; system call + input arguments, which may allow kernel memory may be disclosed + to the user process, has been fixed. For more information, see + security advisory + FreeBSD-SA-05:07.ldt. + &merged; + + Several information disclosure vulnerabilities in various + parts of the kernel have been fixed. For more information, see + security advisory + FreeBSD-SA-05:08.kmem. + &merged; + + @@ -302,7 +324,7 @@ setting the debug.acpi.do_powerstate and hw.pci.do_powerstate sysctls to 0. - The acpi_ibm driver for IBM laptops + The &man.acpi.ibm.4; driver for IBM laptops has been added. The &man.acpi.fujitsu.4; driver for handling ==== //depot/projects/tty/release/doc/share/sgml/release.dsl#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -117,9 +117,9 @@ (element quote (make sequence - (literal "``") + (literal "“") (process-children) - (literal "''"))) + (literal "”"))) (define ($create-refentry-xref-link$ #!optional (n (current-node))) ==== //depot/projects/tty/share/examples/etc/make.conf#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.262 2005/04/13 10:02:58 phk Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.264 2005/05/08 10:11:33 des Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -31,9 +31,9 @@ # Currently the following CPU types are recognized: # Intel x86 architecture: # (AMD CPUs) opteron athlon64 athlon-mp athlon-xp athlon-4 -# athlon-tbird athlon k8 k6-3 k6-2 k6 k5 nocona -# (Intel CPUs) pentium4[m] prescott pentium3[m] pentium2 pentiumpro -# pentium-mmx pentium i486 i386 +# athlon-tbird athlon k8 k6-3 k6-2 k6 k5 +# (Intel CPUs) nocona pentium4[m] prescott pentium3[m] pentium-m +# pentium2 pentiumpro pentium-mmx pentium i486 i386 # Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4 # AMD64 architecture: opteron, athlon64, nocona # Intel ia64 architecture: itanium2, itanium ==== //depot/projects/tty/share/examples/mdoc/example.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.20 2005/01/12 20:56:15 keramida Exp $ +.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.21 2005/05/07 11:02:34 brueffer Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -105,8 +105,7 @@ manual page example first appeared in .At v6 . .Sh AUTHORS -This -manual page was written by +This manual page was written by .An Mike Pritchard Aq mpp@FreeBSD.org . .Sh BUGS The actual code for this device driver is vaporware. ==== //depot/projects/tty/share/man/man4/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.315 2005/04/19 04:01:22 jkoshy Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.316 2005/05/06 15:33:12 glebius Exp $ MAN= aac.4 \ acpi.4 \ @@ -194,6 +194,7 @@ ng_l2tp.4 \ ng_lmi.4 \ ng_mppc.4 \ + ng_nat.4 \ ng_netflow.4 \ ng_one2many.4 \ ng_ppp.4 \ ==== //depot/projects/tty/share/man/man4/ichsmb.4#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ichsmb.4,v 1.6 2002/08/12 16:25:20 mp Exp $ +.\" $FreeBSD: src/share/man/man4/ichsmb.4,v 1.7 2005/05/05 12:00:43 wilko Exp $ .\" .Dd October 5, 2000 .Dt ICHSMB 4 @@ -48,7 +48,8 @@ .Sh DESCRIPTION This driver provides access to the SMBus controller logical device contained in the Intel 82801AA (ICH), 82801AB (ICH0), -82801BA (ICH2), 82801CA (ICH3), and 82801DC (ICH4) PCI chips. +82801BA (ICH2), 82801CA (ICH3), 82801DC (ICH4) and +82801EB (ICH5) PCI chips. .Sh SEE ALSO .Xr smb 4 , .Xr smbus 4 ==== //depot/projects/tty/share/man/man4/man4.i386/Makefile#11 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.177 2005/03/20 15:27:38 philip Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.178 2005/05/07 13:42:15 brueffer Exp $ MAN= acpi_asus.4 \ acpi_fujitsu.4 \ + acpi_ibm.4 \ acpi_panasonic.4 \ acpi_toshiba.4 \ aic.4 \ ==== //depot/projects/tty/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.635 2005/05/04 22:26:40 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.636 2005/05/05 18:19:53 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1374,7 +1374,6 @@ int fill_regs(struct thread *td, struct reg *regs) { - struct pcb *pcb; struct trapframe *tp; tp = td->td_frame; @@ -1398,7 +1397,6 @@ regs->r_rflags = tp->tf_rflags; regs->r_rsp = tp->tf_rsp; regs->r_ss = tp->tf_ss; - pcb = td->td_pcb; return (0); } ==== //depot/projects/tty/sys/boot/pc98/boot2/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.22 2005/04/03 04:58:15 imp Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.23 2005/05/08 14:17:27 nyan Exp $ # PROG= boot @@ -10,7 +10,7 @@ CFLAGS= -Os -mrtd \ -fno-guess-branch-probability \ -fno-unit-at-a-time \ - -D_KERNEL -DPC98 -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} + -D_KERNEL -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} CFLAGS+= ${CWARNFLAGS} CFLAGS+= -I${.CURDIR}/../../.. -I. ==== //depot/projects/tty/sys/boot/pc98/boot2/boot.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.12 2004/12/01 04:59:32 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.13 2005/05/08 14:17:27 nyan Exp $"); #include "boot.h" #include @@ -81,24 +81,16 @@ void boot(int drive) { - int ret; -#ifdef PC98 - int i; + int i, ret; unsigned char disk_equips; -#endif /* Pick up the story from the Bios on geometry of disks */ -#ifdef PC98 for(ret = 0; ret < 2; ret ++) { if (*(unsigned char*)V(0xA155d) & (1 << ret)) { bootinfo.bi_bios_geom[ret] = get_diskinfo(ret + 0x80); } } -#else /* IBM-PC */ - for(ret = 0; ret < N_BIOS_GEOM; ret ++) - bootinfo.bi_bios_geom[ret] = get_diskinfo(ret + 0x80); -#endif /* PC98 */ bootinfo.bi_basemem = memsize(0); bootinfo.bi_extmem = memsize(1); @@ -106,17 +98,14 @@ gateA20(); -#ifdef PC98 /* set machine type to PC98_SYSTEM_PARAMETER */ machine_check(); -#endif /* PC98 */ /* * The default boot device is the first partition in the * compatibility slice on the boot drive. */ dosdev = drive; -#ifdef PC98 maj = (drive&0x70) >> 3; /* a good first bet */ if (maj == 4) { /* da */ disk_equips = *(unsigned char *)V(0xA1482); @@ -132,29 +121,6 @@ } else { unit = drive & 0x0f; } -#else /* IBM-PC */ - maj = 2; - unit = drive & 0x7f; -#ifdef dontneed - slice = 0; - part = 0; -#endif - if (drive & 0x80) { - /* Hard drive. Adjust. */ - maj = 0; -#if BOOT_HD_BIAS > 0 - if (unit >= BOOT_HD_BIAS) { - /* - * The drive is probably a SCSI drive with a unit - * number BOOT_HD_BIAS less than the BIOS drive - * number. - */ - maj = 4; - unit -= BOOT_HD_BIAS; - } -#endif - } -#endif /* PC98 */ readfile("boot.config", boot_config, BOOT_CONFIG_SIZE); name = "/boot/loader"; if (boot_config[0] != '\0') { @@ -173,11 +139,7 @@ ouraddr, bootinfo.bi_basemem, bootinfo.bi_extmem, (loadflags & RB_SERIAL) ? "serial" : "internal", (loadflags & RB_DUAL) ? "/dual" : "", -#ifdef PC98 dosdev & 0x0f, devs[maj], unit, 'a' + part, -#else - dosdev & 0x7f, devs[maj], unit, 'a' + part, -#endif name ? name : "*specify_a_kernel_name*", boot_help); @@ -242,11 +204,7 @@ startaddr = head.a_entry & 0x00FFFFFF; addr = startaddr; printf("Booting %d:%s(%d,%c)%s @ 0x%x\n" -#ifdef PC98 , dosdev & 0x0f -#else - , dosdev & 0x7f -#endif , devs[maj] , unit , 'a'+part ==== //depot/projects/tty/sys/boot/pc98/boot2/boot.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.6 2004/07/30 09:42:04 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.7 2005/05/08 14:17:27 nyan Exp $ */ #include @@ -89,9 +89,7 @@ #endif /* !CDBOOT */ void memcpy(const void *from, void *to, size_t len); void twiddle(void); -#ifdef PC98 void machine_check(void); -#endif /* probe_keyboard.c */ int probe_keyboard(void); @@ -107,7 +105,4 @@ void read(char *buffer, int count); int openrd(void); -#ifdef PC98 #define V(ra) (ra - BOOTSEG * 0x10) -#endif - ==== //depot/projects/tty/sys/boot/pc98/boot2/boot2.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:35:26 rpd * boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp - * $FreeBSD: src/sys/boot/pc98/boot2/boot2.S,v 1.3 2001/05/24 11:18:32 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/boot2.S,v 1.4 2005/05/08 14:17:27 nyan Exp $ */ /* * Ported to PC-9801 by Yoshio Kimura @@ -173,9 +173,7 @@ movl %esp, EXT(dflt_name) #endif -#ifdef PC98 movb 0xA1584 - BOOTSEG * 0x10, %dl -#endif movzbl %dl, %edx /* discard head (%dh) and random high bits */ pushl %edx call EXT(boot) ==== //depot/projects/tty/sys/boot/pc98/boot2/disk.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.11 2004/07/30 09:42:04 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.13 2005/05/08 14:17:27 nyan Exp $"); #include "boot.h" #include @@ -98,12 +98,11 @@ #ifdef EMBEDDED_DISKLABEL dl = &disklabel; #else /* EMBEDDED_DISKLABEL */ -#ifdef PC98 p = Bread(dosdev_copy, 1); dptr = (struct pc98_partition *)p; slice = WHOLE_DISK_SLICE; for (i = 0; i < NDOSPART; i++, dptr++) - if (dptr->dp_mid == DOSPTYP_386BSD) { + if (dptr->dp_mid == DOSMID_386BSD) { slice = BASE_SLICE + i; sector = dptr->dp_scyl * spc; break; @@ -111,20 +110,6 @@ p = Bread(dosdev, sector + LABELSECTOR); dl=((struct disklabel *)p); disklabel = *dl; /* structure copy (maybe useful later)*/ -#else - p = Bread(dosdev_copy, 0); - dptr = (struct dos_partition *)(p+DOSPARTOFF); - slice = WHOLE_DISK_SLICE; - for (i = 0; i < NDOSPART; i++, dptr++) - if (dptr->dp_typ == DOSPTYP_386BSD) { - slice = BASE_SLICE + i; - sector = dptr->dp_start; - break; - } - p = Bread(dosdev_copy, sector + LABELSECTOR); - dl=((struct disklabel *)p); - disklabel = *dl; /* structure copy (maybe useful later)*/ -#endif /* PC98 */ #endif /* EMBEDDED_DISKLABEL */ if (dl->d_magic != DISKMAGIC) { printf("bad disklabel\n"); @@ -133,16 +118,6 @@ /* This little trick is for OnTrack DiskManager disks */ boff = dl->d_partitions[part].p_offset - dl->d_partitions[2].p_offset + sector; - -#ifndef PC98 - bsize = dl->d_partitions[part].p_size; - if (bsize == 0) { - printf("empty partition\n"); - return 1; - } - -#endif - } #endif /* RAWBOOT */ return 0; @@ -176,12 +151,6 @@ int cyl, head, sec, nsec; cyl = sector/spc; -#ifndef PC98 - if (cyl > 1023) { - printf("Error: C:%d > 1023 (BIOS limit)\n", cyl); - for(;;); /* loop forever */ - } -#endif head = (sector % spc) / spt; sec = sector % spt; nsec = spt - sec; ==== //depot/projects/tty/sys/boot/pc98/boot2/io.c#4 (text+ko) ==== @@ -27,16 +27,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.6 2004/07/30 09:42:04 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); #include "boot.h" #include #include -#ifdef PC98 #include -#endif - static int getchar(int in_buf); /* @@ -159,15 +156,10 @@ void delay1ms(void) { -#ifdef PC98 int i = 800; + while (--i >= 0) (void)outb(0x5f,0); /* about 600ns */ -#else - int i = 800; - while (--i >= 0) - (void)inb(0x84); -#endif } static __inline int @@ -193,7 +185,6 @@ static __inline unsigned pword(unsigned physaddr) { -#ifdef PC98 static int counter = 0; int i; @@ -201,28 +192,13 @@ (void)outb(0x5f, 0); return (counter++); -#else - unsigned result; - - /* - * Give the fs prefix separately because gas omits it for - * "movl %fs:0x46c, %eax". - */ - __asm __volatile("fs; movl %1, %0" : "=r" (result) - : "m" (*(unsigned *)physaddr)); - return (result); -#endif } int gets(char *buf) { #define bios_tick pword(0x46c) -#ifdef PC98 #define BIOS_TICK_MS 1 -#else -#define BIOS_TICK_MS 55 -#endif unsigned initial_bios_tick; char *ptr=buf; ==== //depot/projects/tty/sys/boot/pc98/boot2/sys.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.6 2004/07/30 09:42:04 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); /* * Ported to PC-9801 by Yoshio Kimura @@ -262,11 +262,7 @@ } biosdrive = biosdrivedigit - '0'; if (biosdrivedigit == '\0') { -#ifdef PC98 biosdrive = dosdev & 0x0f; -#else - biosdrive = unit; -#endif #if BOOT_HD_BIAS > 0 /* XXX */ if (maj == 4) @@ -275,29 +271,16 @@ } switch(maj) { -#ifdef PC98 case 4: /* da */ dosdev_copy = biosdrive | 0xA0; /* SCSI HD or MO */ -#else /* IBM-PC */ - case 0: - case 4: - dosdev_copy = biosdrive | 0x80; -#endif break; -#ifdef PC98 case 0: /* wd */ case 2: /* 1200KB fd */ dosdev_copy = (maj << 3) | unit | 0x80; -#else - case 2: - dosdev_copy = biosdrive; -#endif break; -#ifdef PC98 case 6: /* 1440KB fd */ dosdev_copy = (maj << 3) | unit; break; -#endif default: printf("Unknown device\n"); return 1; ==== //depot/projects/tty/sys/boot/pc98/boot2/table.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.4 2003/09/08 09:11:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.5 2005/05/08 14:17:27 nyan Exp $"); #include "boot.h" @@ -85,16 +85,12 @@ {0xFFFF, 0x0, 0x0, 0x93, 0xCF, 0x0}, /* 0x10 : kernel data */ /* 0x92? */ {0xFFFF, RUN, RUN, 0x9E, 0x40, 0x0}, /* 0x18 : boot code */ -#ifdef PC98 /* * The limit of boot data should be more than or equal to 0x9FFFF * for saving BIOS parameter and EPSON machine ID into 2'nd T-VRAM, * because base address is normally 0x10000. */ {0xFFFF, RUN, RUN, 0x92, 0x4F, 0x0}, /* 0x20 : boot data */ -#else - {0xFFFF, RUN, RUN, 0x92, 0x40, 0x0}, /* 0x20 : boot data */ -#endif {0xFFFF, RUN, RUN, 0x9E, 0x0, 0x0}, /* 0x28 : boot code, 16 bits */ {0xFFFF, 0x0, 0x0, 0x92, 0x0, 0x0}, /* 0x30 : boot data, 16 bits */ #ifdef BDE_DEBUGGER ==== //depot/projects/tty/sys/boot/pc98/btx/btx/Makefile#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<