Date: Sun, 21 Sep 2003 10:39:31 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38384 for review Message-ID: <200309211739.h8LHdVHG058111@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=38384 Change 38384 by marcel@marcel_nfs on 2003/09/21 10:38:32 IFC @38378 Affected files ... .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#12 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#12 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#8 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/fr.ISO8859-1#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#17 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/ru.KOI8-R#4 integrate .. //depot/projects/ia64/release/Makefile#71 integrate .. //depot/projects/ia64/sbin/dump/optr.c#11 integrate .. //depot/projects/ia64/share/man/man4/re.4#2 integrate .. //depot/projects/ia64/share/man/man7/release.7#25 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#14 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_button.c#9 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#18 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#54 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#24 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#12 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.13 2003/09/12 19:19:10 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.14 2003/09/21 07:59:16 deischen Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -159,10 +159,9 @@ #include <sys/param.h> #if __FreeBSD_version >= 500016 #define FBSD_LIB_SPEC " \ - %{pthread: %eThe -pthread option is deprecated.} \ %{!shared: \ - %{!pg: -lc} \ - %{pg: -lc_p} \ + %{!pg: %{pthread:-lc_r} -lc} \ + %{pg: %{pthread:-lc_r_p} -lc_p} \ }" #else #define FBSD_LIB_SPEC " \ ==== //depot/projects/ia64/contrib/groff/tmac/doc-common#12 (text+ko) ==== @@ -339,12 +339,18 @@ .. . . +.\" NS doc-default-operating-system global string +.\" NS the exact (default) version of the operating system +.\" NS +.\" NS override this in `mdoc.local', if necessary +. +.ds doc-default-operating-system BSD +. +. .\" NS doc-operating-system global string .\" NS the exact version of the operating system -.\" NS -.\" NS override this in `mdoc.local', if necessary . -.ds doc-operating-system BSD +.ds doc-operating-system . . .\" NS Os user macro (not parsed, not callable) @@ -434,10 +440,9 @@ .ds doc-operating-system-FreeBSD-5.0 5.0 . .de Os -. if "\$1"" \ -. return -. -. ie "\$1"ATT" \{\ +. ie "\$1"" \ +. ds doc-operating-system "\*[doc-default-operating-system] +. el \{ .ie "\$1"ATT" \{\ . ds doc-operating-system AT&T . if \A\$2 \{\ . ie d doc-operating-system-ATT-\$2 \ @@ -472,7 +477,7 @@ . ds doc-operating-system \$1 . if !"\$2"" \ . as doc-operating-system " \$2 -. \}\}\}\} +. \}\}\}\}\} .. . . @@ -696,6 +701,12 @@ .nr doc-in-synopsis-section 0 . . +.\" NS doc-in-library-section global register (bool) +.\" NS whether we are in the `library' section +. +.nr doc-in-library-section 0 +. +. .\" NS doc-in-see-also-section global register (bool) .\" NS whether we are in the `see also' section . @@ -733,6 +744,7 @@ .\" NS doc-func-count .\" NS doc-in-authors-section .\" NS doc-in-files-section +.\" NS doc-in-library-section .\" NS doc-in-see-also-section .\" NS doc-in-synopsis-section .\" NS doc-indent-synopsis @@ -749,6 +761,7 @@ . .ds doc-section-name NAME .ds doc-section-synopsis SYNOPSIS +.ds doc-section-library LIBRARY .ds doc-section-description DESCRIPTION .ds doc-section-see-also SEE .ds doc-section-files FILES @@ -795,6 +808,7 @@ . \} . el \{\ . nr doc-in-synopsis-section 0 +. nr doc-in-library-section 0 . nr doc-in-see-also-section 0 . nr doc-in-files-section 0 . nr doc-in-authors-section 0 @@ -806,6 +820,9 @@ . nr doc-indent-synopsis 0 . nr doc-indent-synopsis-active 0 . \} +. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-library]" \{\ +. nr doc-in-library-section 1 +. \} . el \{ .ie "\*[doc-str-dfp]"\*[doc-section-description]" \{\ . nr doc-is-func 0 . nr doc-func-count 0 @@ -821,7 +838,7 @@ . nr doc-in-files-section 1 . el .if "\*[doc-str-dfp]"\*[doc-section-authors]" \ . nr doc-in-authors-section 1 -. \}\}\} +. \}\}\}\} . . in 0 . nr doc-have-author 0 @@ -1058,6 +1075,7 @@ . tm doc-display-vertical == \n[doc-display-vertical] . tm doc-header-string == `\*[doc-header-string]' . tm doc-in-synopsis-section == \n[doc-in-synopsis-section] +. tm doc-in-library-section == \n[doc-in-library-section] . tm doc-in-see-also-section == \n[doc-in-see-also-section] . tm doc-in-files-section == \n[doc-in-files-section] . tm doc-in-authors-section == \n[doc-in-authors-section] ==== //depot/projects/ia64/contrib/groff/tmac/doc-syms#5 (text+ko) ==== @@ -716,7 +716,11 @@ . \" replacing argument with result . ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Lb] . +. if \n[doc-in-library-section] \ +. br . doc-print-recursive +. if \n[doc-in-library-section] \ +. br . \} . el \{\ . tm Usage: .Lb library_name ... (#\n[.c]) ==== //depot/projects/ia64/contrib/groff/tmac/doc.tmac#8 (text+ko) ==== @@ -3321,6 +3321,7 @@ . nr doc-curr-font-saved \n[doc-curr-font] . nr doc-curr-size-saved \n[doc-curr-size] . nr doc-in-synopsis-section-saved \n[doc-in-synopsis-section] +. nr doc-in-library-section-saved \n[doc-in-library-section] . nr doc-indent-synopsis-saved \n[doc-indent-synopsis] . nr doc-indent-synopsis-active-saved \n[doc-indent-synopsis-active] . nr doc-have-decl-saved \n[doc-have-decl] @@ -3460,6 +3461,7 @@ . nr doc-curr-font \n[doc-curr-font-saved] . nr doc-curr-size \n[doc-curr-size-saved] . nr doc-in-synopsis-section \n[doc-in-synopsis-section-saved] +. nr doc-in-library-section \n[doc-in-library-section-saved] . nr doc-indent-synopsis \n[doc-indent-synopsis-saved] . nr doc-indent-synopsis-active \n[doc-indent-synopsis-active-saved] . nr doc-have-decl \n[doc-have-decl-saved] @@ -5164,11 +5166,14 @@ .\" NS doc-issue-count .\" NS doc-issue-name .\" NS doc-journal-count -.\" NS doc-journam-name +.\" NS doc-journal-name .\" NS doc-optional-count .\" NS doc-optional-string .\" NS doc-page-number-count .\" NS doc-page-number-string +.\" NS doc-publisher-count +.\" NS doc-publisher-name +.\" NS doc-reference-count .\" NS doc-reference-title-count .\" NS doc-reference-title-name .\" NS doc-reference-title-name-for-book @@ -5192,6 +5197,8 @@ . nr doc-date-count 0 . nr doc-page-number-count 0 . nr doc-book-count 0 +. nr doc-publisher-count 0 +. nr doc-reference-count 0 . . ds doc-journal-name . ds doc-issue-name @@ -5204,6 +5211,7 @@ . ds doc-date . ds doc-page-number-string . ds doc-book-name +. ds doc-publisher-name .. . . ==== //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#9 (text+ko) ==== @@ -786,7 +786,7 @@ the middle part of the manual page header strings are shown. Note how .Ql \e& -prevents the digit\~1 from being a valid numeric expression. +prevents the digit\~7 from being a valid numeric expression. . .Bd -ragged .Bl -tag -width ".Li .Dt\ FOO\ 2\ i386" -compact -offset indent @@ -1108,6 +1108,15 @@ To remove the special meaning from a punctuation character escape it with .Ql \e& . .Pp +The following punctuation characters are recognized by +.Nm \-mdoc : +. +.Bl -column -offset indent-two XXXXXX XXXXXX XXXXXX XXXXXX +.It Li .\& Ta Li ,\& Ta Li :\& Ta Li ;\& Ta Li (\& +.It Li )\& Ta Li [\& Ta Li ]\& Ta Li ?\& Ta Li !\& +.El +.Pp +. .Xr Troff is limited as a macro language, and has difficulty when presented with a string containing a member of the mathematical, logical or quotation set: @@ -1693,6 +1702,13 @@ then denotes the keyword to be used with the .Ql .Lb macro. +.Pp +In the +.Sx LIBRARY +section an +.Ql .Lb +command causes a line break before and after its arguments are printed. +.Pp . .Ss Literals . ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/fr.ISO8859-1#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/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.3 2003/09/09 23:27:03 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.4 2003/09/20 21:23:53 ru Exp $ .\" .\" %beginstrip% . @@ -62,6 +62,7 @@ .\" .Sh localization .ds doc-section-name NOM .ds doc-section-synopsis SYNOPSIS +.ds doc-section-library BIBLIOTHхQUE .ds doc-section-description DESCRIPTION .ds doc-section-see-also VOIR .ds doc-section-files FICHIERS ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#17 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>. +.\" Copyright (c) 2001-2003 Ruslan Ermilov <ru@FreeBSD.org>. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.28 2003/08/05 10:29:50 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.30 2003/09/20 21:32:26 ru Exp $ .\" .\" %beginstrip% . @@ -53,7 +53,7 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-operating-system FreeBSD\~5.1 +.ds doc-default-operating-system FreeBSD\~5.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.9 4.9 ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/ru.KOI8-R#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>. +.\" Copyright (c) 2001-2003 Ruslan Ermilov <ru@FreeBSD.org>. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.11 2003/09/09 23:19:03 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.14 2003/09/20 21:30:33 ru Exp $ .\" .\" %beginstrip% . @@ -62,6 +62,7 @@ .\" локализация .Sh .ds doc-section-name НАЗВАНИЕ .ds doc-section-synopsis СИНТАКСИС +.ds doc-section-library БИБЛИОТЕКА .ds doc-section-description ОПИСАНИЕ .ds doc-section-see-also СМОТРИ .ds doc-section-files ФАЙЛЫ @@ -76,10 +77,10 @@ .ds doc-str-Lb-libcipher Библиотека криптографии FreeSec (libcipher, \-lcipher) .ds doc-str-Lb-libcompat Библиотека совместимости (libcompat, \-lcompat) .ds doc-str-Lb-libcrypt Библиотека криптографии (libcrypt, \-lcrypt) -.ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) -.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) +.\" XXX ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) +.\" XXX ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) .ds doc-str-Lb-libdevstat Библиотека статистики устройств (libdevstat, \-ldevstat) -.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) +.\" XXX ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) .ds doc-str-Lb-libedit Библиотека редактора командной строки (libedit, \-ledit) .ds doc-str-Lb-libfetch Библиотека файловой передачи (libfetch, \-lfetch) .ds doc-str-Lb-libgeom Пользовательская API библиотека подсистемы ядра GEOM (libgeom, \-lgeom) @@ -88,17 +89,17 @@ .ds doc-str-Lb-libipx Библиотека поддержки конверсии адресов IPX (libipx, \-lipx) .ds doc-str-Lb-libkvm Библиотека доступа к данным ядра (libkvm, \-lkvm) .ds doc-str-Lb-libm Библиотека математических функций (libm, \-lm) -.ds doc-str-Lb-libmd Message Digest (MD4, MD5, и т.д.) Support Library (libmd, \-lmd) -.ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) +.\" XXX ds doc-str-Lb-libmd Message Digest (MD4, MD5, и т.д.) Support Library (libmd, \-lmd) +.\" XXX ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) .ds doc-str-Lb-libnetgraph Пользовательская библиотека Netgraph (libnetgraph, \-lnetgraph) .ds doc-str-Lb-libossaudio Библиотека эмуляции OSS Audio (libossaudio, \-lossaudio) .ds doc-str-Lb-libpam Библиотека PAM (libpam, \-lpam) .ds doc-str-Lb-libposix Библиотека \*[Px]\-совместимости (libposix, \-lposix) -.ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) +.\" XXX ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) .ds doc-str-Lb-librpcsvc Библиотека служб RPC (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-libtermcap Библиотека доступа к termcap (libtermcap, \-ltermcap) .ds doc-str-Lb-libufs Библиотека доступа к файловой системе UFS (libufs, \-lufs) -.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) +.\" XXX ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) .ds doc-str-Lb-libusbhid Библиотека функций доступа к USB HID (libusbhid, \-lusbhid) .ds doc-str-Lb-libutil Библиотека системных утилит (libutil, \-lutil) .ds doc-str-Lb-libvgl Библиотека видео-графики (libvgl, \-lvgl) ==== //depot/projects/ia64/release/Makefile#71 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.819 2003/09/19 09:06:15 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.820 2003/09/21 06:33:14 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -345,8 +345,13 @@ cd ${CHROOTDIR}/usr && \ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif -.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) - cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) + cd ${CHROOTDIR}/usr/${RELEASESRCMODULE} +.for p in ${LOCAL_PATCHES} +.if exists(${p}) + patch ${PATCH_FLAGS} < ${p} +.endif +.endfor .endif .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} ==== //depot/projects/ia64/sbin/dump/optr.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/optr.c,v 1.25 2003/04/07 11:34:12 mdodd Exp $"; + "$FreeBSD: src/sbin/dump/optr.c,v 1.26 2003/09/20 23:35:37 ps Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -233,10 +233,10 @@ (void) fprintf(stderr, "pid=%d ", getpid()); #endif va_start(ap, fmt); - (void) vfprintf(stderr, fmt, ap); + (void) vsnprintf(lastmsg, sizeof(lastmsg), fmt, ap); + (void) fprintf(stderr, lastmsg); (void) fflush(stdout); (void) fflush(stderr); - (void) vsnprintf(lastmsg, sizeof(lastmsg), fmt, ap); va_end(ap); } ==== //depot/projects/ia64/share/man/man4/re.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 Wind River Systems +.\" Copyright (c) 2003 .\" Bill Paul <wpaul@windriver.com>. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -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/re.4,v 1.1 2003/09/09 02:45:53 wpaul Exp $ +.\" $FreeBSD: src/share/man/man4/re.4,v 1.2 2003/09/20 21:42:56 wpaul Exp $ .\" .Dd September 4, 2003 .Dt RE 4 @@ -52,7 +52,9 @@ .It Compaq Evo N1015v Integrated Ethernet (8139C+) .It -Xterasys XN-152 10/100/1000 (8169) +Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S) +.It +Xterasys XN-152 10/100/1000 NIC (8169) .El .Pp NICs based on the 8139C+ are capable of 10 and 100Mbps speeds over CAT5 ==== //depot/projects/ia64/share/man/man7/release.7#25 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/release.7,v 1.31 2003/08/04 21:00:35 ru Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.32 2003/09/21 06:33:14 ru Exp $ .\" .Dd March 12, 2002 .Dt RELEASE 7 @@ -260,7 +260,7 @@ so that it can be booted from the loader via .Dq Li "boot <config>" . .It Va LOCAL_PATCHES -A patch file against +Patch files against .Pa /usr/src that will be applied in the .Xr chroot 8 ==== //depot/projects/ia64/sys/cam/cam_periph.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.52 2003/09/10 18:23:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.53 2003/09/21 08:42:32 thomas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -975,7 +975,7 @@ sense_key = saved_ccb->csio.sense_data.flags; sense_key &= SSD_KEY; if (sense_key != SSD_KEY_NO_SENSE) { - saved_ccb->ccb_h.flags |= + saved_ccb->ccb_h.status |= CAM_AUTOSNS_VALID; xpt_print_path(saved_ccb->ccb_h.path); printf("Recovered Sense\n"); ==== //depot/projects/ia64/sys/cam/scsi/scsi_all.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.42 2003/06/10 18:14:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.43 2003/09/21 08:45:36 thomas Exp $"); #include <sys/param.h> @@ -2408,6 +2408,7 @@ scsi_cmd = (struct scsi_request_sense *)&csio->cdb_io.cdb_bytes; bzero(scsi_cmd, sizeof(*scsi_cmd)); scsi_cmd->opcode = REQUEST_SENSE; + scsi_cmd->length = dxfer_len; } void ==== //depot/projects/ia64/sys/dev/acpica/acpi_button.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.13 2003/08/11 15:34:43 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.14 2003/09/21 02:49:59 njl Exp $ */ #include "opt_acpi.h" @@ -43,9 +43,10 @@ struct acpi_button_softc { device_t button_dev; ACPI_HANDLE button_handle; - boolean_t button_type; /* Power or Sleep Button */ + boolean_t button_type; #define ACPI_POWER_BUTTON 0 #define ACPI_SLEEP_BUTTON 1 + boolean_t fixed; }; #define ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP 0x80 @@ -57,6 +58,8 @@ static int acpi_button_resume(device_t dev); static void acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context); +static ACPI_STATUS + acpi_button_fixed_handler(void *context); static void acpi_button_notify_pressed_for_sleep(void *arg); static void acpi_button_notify_pressed_for_wakeup(void *arg); @@ -85,23 +88,31 @@ acpi_button_probe(device_t dev) { struct acpi_button_softc *sc; + int ret = ENXIO; sc = device_get_softc(dev); - if (acpi_get_type(dev) == ACPI_TYPE_DEVICE) { - if (!acpi_disabled("button")) { - if (acpi_MatchHid(dev, "PNP0C0C")) { - device_set_desc(dev, "Power Button"); - sc->button_type = ACPI_POWER_BUTTON; - return (0); - } - if (acpi_MatchHid(dev, "PNP0C0E")) { - device_set_desc(dev, "Sleep Button"); - sc->button_type = ACPI_SLEEP_BUTTON; - return (0); - } + if (acpi_get_type(dev) == ACPI_TYPE_DEVICE && !acpi_disabled("button")) { + if (acpi_MatchHid(dev, "PNP0C0C")) { + device_set_desc(dev, "Power Button"); + sc->button_type = ACPI_POWER_BUTTON; + ret = 0; + } else if (acpi_MatchHid(dev, "ACPI_FPB")) { + device_set_desc(dev, "Power Button (fixed)"); + sc->button_type = ACPI_POWER_BUTTON; + sc->fixed = 1; + ret = 0; + } else if (acpi_MatchHid(dev, "PNP0C0E")) { + device_set_desc(dev, "Sleep Button"); + sc->button_type = ACPI_SLEEP_BUTTON; + ret = 0; + } else if (acpi_MatchHid(dev, "ACPI_FSB")) { + device_set_desc(dev, "Sleep Button (fixed)"); + sc->button_type = ACPI_SLEEP_BUTTON; + sc->fixed = 1; + ret = 0; } } - return (ENXIO); + return (ret); } static int @@ -109,6 +120,7 @@ { struct acpi_button_softc *sc; ACPI_STATUS status; + int event; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -116,10 +128,17 @@ sc->button_dev = dev; sc->button_handle = acpi_get_handle(dev); - status = AcpiInstallNotifyHandler(sc->button_handle, ACPI_DEVICE_NOTIFY, - acpi_button_notify_handler, sc); + if (sc->fixed) { + event = (sc->button_type == ACPI_SLEEP_BUTTON) ? + ACPI_EVENT_SLEEP_BUTTON : ACPI_EVENT_POWER_BUTTON; + status = AcpiInstallFixedEventHandler(event, + acpi_button_fixed_handler, sc); + } else { + status = AcpiInstallNotifyHandler(sc->button_handle, + ACPI_DEVICE_NOTIFY, acpi_button_notify_handler, sc); + } if (ACPI_FAILURE(status)) { - device_printf(sc->button_dev, "couldn't install Notify handler - %s\n", + device_printf(sc->button_dev, "couldn't install notify handler - %s\n", AcpiFormatException(status)); return_VALUE (ENXIO); } @@ -217,3 +236,16 @@ break; /* unknown notification value */ } } + +static ACPI_STATUS +acpi_button_fixed_handler(void *context) +{ + struct acpi_button_softc *sc = (struct acpi_button_softc *)context; + + if (context == NULL) + return_ACPI_STATUS (AE_BAD_PARAMETER); + + acpi_button_notify_handler(sc->button_handle, + ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP, sc); + return_VALUE (AE_OK); +} ==== //depot/projects/ia64/sys/dev/ata/atapi-cam.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.23 2003/09/19 16:25:44 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.25 2003/09/21 16:49:53 thomas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -346,8 +346,8 @@ struct ccb_trans_settings *cts = &ccb->cts; /* - * XXX The default CAM transport code is very scsi specific and - * doesn't understand IDE speeds very well. Be silent about it + * XXX The default CAM transport code is very SCSI-specific and + * doesn't understand IDE speeds very well. Be silent about it * here and let it default to what is set in XPT_PATH_INQ */ CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_SUBTRACE, ("GET_TRAN_SETTINGS\n")); @@ -544,23 +544,31 @@ { struct atapi_hcb *hcb = (struct atapi_hcb *) request->driver; struct ccb_scsiio *csio = &hcb->ccb->csio; - int hcb_status = request->result; + u_int32_t rc; mtx_lock(&Giant); - #ifdef CAMDEBUG - if (CAM_DEBUGGED(csio->ccb_h.path, CAM_DEBUG_CDB)) { - printf("atapi_cb: hcb@%p status = %02x: (sk = %02x%s%s%s)\n", - hcb, hcb_status, hcb_status >> 4, - (hcb_status & 4) ? " ABRT" : "", - (hcb_status & 2) ? " EOM" : "", - (hcb_status & 1) ? " ILI" : ""); - printf(" %s: cmd %02x\n", - request->device->name, request->u.atapi.ccb[0]); - } +# define err (request->error) + if (CAM_DEBUGGED(csio->ccb_h.path, CAM_DEBUG_CDB)) { + printf("atapi_cb: hcb@%p error = %02x: (sk = %02x%s%s%s)\n", + hcb, err, err >> 4, + (err & 4) ? " ABRT" : "", + (err & 2) ? " EOM" : "", + (err & 1) ? " ILI" : ""); + printf("dev %s: cmd %02x status %02x result %02x\n", + request->device->name, request->u.atapi.ccb[0], + request->status, request->result); + } #endif - if (hcb_status != 0) { + + if (request->result != 0) { + rc = CAM_SCSI_STATUS_ERROR; csio->scsi_status = SCSI_STATUS_CHECK_COND; +#if 0 + /* + * XXX Temporarily disable autosense, as this seems to cause + * a missed ATA interrupt. + */ if ((csio->ccb_h.flags & CAM_DIS_AUTOSENSE) == 0) { int8_t ccb[16] = { ATAPI_REQUEST_SENSE, 0, 0, 0, sizeof(struct atapi_sense), 0, 0, 0, 0, 0, 0, @@ -572,17 +580,17 @@ csio->ccb_h.status |= CAM_AUTOSNS_VALID; } } - free_hcb_and_ccb_done(hcb, CAM_SCSI_STATUS_ERROR); - } - else { +#endif + } else { + rc = CAM_REQ_CMP; + csio->scsi_status = SCSI_STATUS_OK; if (((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) && hcb->dxfer_alloc != NULL) { bcopy(hcb->dxfer_alloc, csio->data_ptr, csio->dxfer_len); } - csio->scsi_status = SCSI_STATUS_OK; - free_hcb_and_ccb_done(hcb, CAM_REQ_CMP); } + free_hcb_and_ccb_done(hcb, rc); mtx_unlock(&Giant); } ==== //depot/projects/ia64/sys/dev/re/if_re.c#6 (text+ko) ==== @@ -106,7 +106,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.9 2003/09/19 02:35:03 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.10 2003/09/20 21:18:27 wpaul Exp $"); #include <sys/param.h> #include <sys/endian.h> @@ -2081,14 +2081,12 @@ /* * Enable C+ RX and TX mode, as well as VLAN stripping and - * RX checksum offload. Only enable dual-address cycle if - * we're on a 64-bit bus. We must configure the C+ register + * RX checksum offload. We must configure the C+ register * before all others. */ CSR_WRITE_2(sc, RL_CPLUS_CMD, RL_CPLUSCMD_RXENB| RL_CPLUSCMD_TXENB|RL_CPLUSCMD_PCI_MRW| - (CSR_READ_1(sc, RL_CFG2) & RL_BUSWIDTH_64BITS ? - RL_CPLUSCMD_PCI_DAC : 0)|RL_CPLUSCMD_VLANSTRIP| + RL_CPLUSCMD_VLANSTRIP| (ifp->if_capenable & IFCAP_RXCSUM ? RL_CPLUSCMD_RXCSUM_ENB : 0)); ==== //depot/projects/ia64/sys/i386/i386/pmap.c#64 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.433 2003/09/13 21:57:37 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.434 2003/09/20 23:54:36 alc Exp $"); /* * Manages physical address maps. @@ -1363,15 +1363,9 @@ void pmap_release(pmap_t pmap) { - vm_object_t object; - vm_page_t m; + vm_page_t m, ptdpg[NPGPTD]; int i; - object = pmap->pm_pteobj; - - KASSERT(object->ref_count == 1, - ("pmap_release: pteobj reference count %d != 1", - object->ref_count)); KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); @@ -1381,6 +1375,9 @@ LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + for (i = 0; i < NPGPTD; i++) + ptdpg[i] = PHYS_TO_VM_PAGE(pmap->pm_pdir[PTDPTDI + i]); + bzero(pmap->pm_pdir + PTDPTDI, (nkpt + NPGPTD) * sizeof(*pmap->pm_pdir)); #ifdef SMP @@ -1391,7 +1388,7 @@ vm_page_lock_queues(); for (i = 0; i < NPGPTD; i++) { - m = TAILQ_FIRST(&object->memq); + m = ptdpg[i]; #ifdef PAE KASSERT(VM_PAGE_TO_PHYS(m) == (pmap->pm_pdpt[i] & PG_FRAME), ("pmap_release: got wrong ptd page")); @@ -1401,8 +1398,6 @@ vm_page_busy(m); vm_page_free_zero(m); } - KASSERT(TAILQ_EMPTY(&object->memq), - ("pmap_release: leaking page table pages")); vm_page_unlock_queues(); } ==== //depot/projects/ia64/sys/vm/uma_core.c#54 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.83 2003/09/19 23:27:46 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.85 2003/09/21 07:39:16 jeff Exp $"); /* I should really use ktr.. */ /* @@ -176,6 +176,7 @@ static void *obj_alloc(uma_zone_t, int, u_int8_t *, int); static void *page_alloc(uma_zone_t, int, u_int8_t *, int); +static void *startup_alloc(uma_zone_t, int, u_int8_t *, int); static void page_free(void *, int, u_int8_t); static uma_slab_t slab_zalloc(uma_zone_t, int); static void cache_drain(uma_zone_t); @@ -788,6 +789,42 @@ } /* + * This function is intended to be used early on in place of page_alloc() so + * that we may use the boot time page cache to satisfy allocations before + * the VM is ready. + */ +static void * +startup_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait) +{ + /* + * Check our small startup cache to see if it has pages remaining. + */ + mtx_lock(&uma_mtx); + if (uma_boot_free != 0) { + uma_slab_t tmps; + + tmps = LIST_FIRST(&uma_boot_pages); + LIST_REMOVE(tmps, us_link); + uma_boot_free--; + mtx_unlock(&uma_mtx); + *pflag = tmps->us_flags; + return (tmps->us_data); + } + mtx_unlock(&uma_mtx); + if (booted == 0) + panic("UMA: Increase UMA_BOOT_PAGES"); + /* + * Now that we've booted reset these users to their real allocator. + */ +#ifdef UMA_MD_SMALL_ALLOC + zone->uz_allocf = uma_small_alloc; +#else + zone->uz_allocf = page_alloc; +#endif + return zone->uz_allocf(zone, bytes, pflag, wait); +} + +/* * Allocates a number of pages from the system * * Arguments: @@ -804,23 +841,6 @@ { void *p; /* Returned page */ - /* - * Check our small startup cache to see if it has pages remaining. - */ - if (uma_boot_free != 0 && bytes <= PAGE_SIZE) { - uma_slab_t tmps; - - tmps = LIST_FIRST(&uma_boot_pages); - LIST_REMOVE(tmps, us_link); - uma_boot_free--; - *pflag = tmps->us_flags; - return (tmps->us_data); - } else if (booted == 0) { - if (bytes > PAGE_SIZE) - panic("UMA: Can't allocate multiple pages before vm " - "has started.\n"); - panic("UMA: Increase UMA_BOOT_PAGES"); - } *pflag = UMA_SLAB_KMEM; p = (void *) kmem_malloc(kmem_map, bytes, wait); @@ -1059,13 +1079,18 @@ zone_large_init(zone); else zone_small_init(zone); + /* + * If we haven't booted yet we need allocations to go through the + * startup cache until the vm is ready. + */ + if (zone->uz_ppera == 1) { #ifdef UMA_MD_SMALL_ALLOC - if (zone->uz_ppera == 1) { zone->uz_allocf = uma_small_alloc; zone->uz_freef = uma_small_free; +#endif + if (booted == 0) + zone->uz_allocf = startup_alloc; } -#endif /* UMA_MD_SMALL_ALLOC */ - if (arg->flags & UMA_ZONE_MTXCLASS) privlc = 1; else ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#24 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.19 2003/09/14 00:40:24 njl Exp $ + * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.20 2003/09/21 03:51:48 njl Exp $ */ #include <sys/param.h> @@ -479,7 +479,8 @@ sep = '{'; PRINTFLAG(fadt->iapc_boot_arch, LEGACY_DEV); PRINTFLAG(fadt->iapc_boot_arch, 8042); - printf("}\n"); + if (fadt->iapc_boot_arch != 0) + printf("}\n"); printf("\tFlags="); sep = '{'; @@ -497,7 +498,8 @@ PRINTFLAG(fadt->flags, SEALED_CASE); PRINTFLAG(fadt->flags, HEADLESS); PRINTFLAG(fadt->flags, CPU_SW_SLP); - printf("}\n"); + if (fadt->flags != 0) + printf("}\n"); #undef PRINTFLAG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309211739.h8LHdVHG058111>