Date: Sat, 23 Apr 2005 01:49:32 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 75758 for review Message-ID: <200504230149.j3N1nWrJ023194@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=75758 Change 75758 by marcel@marcel_nfs on 2005/04/23 01:48:42 IFC @75757 Affected files ... .. //depot/projects/ia64/contrib/cvs/src/login.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/patch.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#7 integrate .. //depot/projects/ia64/games/factor/Makefile#7 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#9 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#26 integrate .. //depot/projects/ia64/lib/libatm/Makefile#7 integrate .. //depot/projects/ia64/lib/libopie/Makefile#7 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#9 integrate .. //depot/projects/ia64/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#26 integrate .. //depot/projects/ia64/sys/conf/files#131 integrate .. //depot/projects/ia64/sys/conf/files.amd64#28 integrate .. //depot/projects/ia64/sys/conf/files.i386#66 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#51 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#46 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#59 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#10 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#30 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakecode.S#6 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#39 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#53 integrate .. //depot/projects/ia64/sys/modules/Makefile#86 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/puc/Makefile#1 branch .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/ia64/sys/sys/lock.h#12 integrate .. //depot/projects/ia64/sys/sys/mutex.h#25 integrate .. //depot/projects/ia64/sys/sys/vnode.h#49 integrate .. //depot/projects/ia64/usr.sbin/config/main.c#9 integrate Differences ... ==== //depot/projects/ia64/contrib/cvs/src/login.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * * Allow user to log in for an authenticating server. * - * $FreeBSD: src/contrib/cvs/src/login.c,v 1.8 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/login.c,v 1.9 2005/04/22 17:58:25 simon Exp $ */ #include "cvs.h" @@ -116,7 +116,7 @@ if (isspace(*(linebuf + 1))) /* special case since strtoul ignores leading white space */ - entry_version = 0; + q = linebuf + 1; else entry_version = strtoul (linebuf + 1, &q, 10); ==== //depot/projects/ia64/contrib/cvs/src/patch.c#6 (text+ko) ==== @@ -10,6 +10,8 @@ * Create a Larry Wall format "patch" file between a previous release and the * current head of a module, or between two releases. Can specify the * release as either a date or a revision number. + * + * $FreeBSD: src/contrib/cvs/src/patch.c,v 1.2 2005/04/22 17:58:25 simon Exp $ */ #include <assert.h> @@ -385,6 +387,7 @@ struct utimbuf t; char *vers_tag, *vers_head; char *rcs = NULL; + char *rcs_orig = NULL; RCSNode *rcsfile; FILE *fp1, *fp2, *fp3; int ret = 0; @@ -415,7 +418,7 @@ if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC)) isattic = 1; - rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5); + rcs_orig = rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5); (void) sprintf (rcs, "%s%s", finfo->file, RCSEXT); /* if vers_head is NULL, may have been removed from the release */ @@ -757,8 +760,8 @@ free (vers_tag); if (vers_head != NULL) free (vers_head); - if (rcs != NULL) - free (rcs); + if (rcs_orig) + free (rcs_orig); return ret; } ==== //depot/projects/ia64/contrib/cvs/src/rcs.c#7 (text+ko) ==== @@ -7,7 +7,7 @@ * The routines contained in this file do all the rcs file parsing and * manipulation * - * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.27 2004/07/06 08:10:38 des Exp $ + * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.28 2005/04/22 17:58:25 simon Exp $ */ #include <assert.h> @@ -3041,8 +3041,7 @@ if (retval != NULL) return (retval); - if (!force_tag_match || - (vers != NULL && RCS_datecmp (vers->date, date) <= 0)) + if (vers && (!force_tag_match || RCS_datecmp (vers->date, date) <= 0)) return xstrdup (vers->version); else return NULL; @@ -4139,7 +4138,7 @@ size_t len; int free_value = 0; char *log = NULL; - size_t loglen; + size_t loglen = 0; Node *vp = NULL; #ifdef PRESERVE_PERMISSIONS_SUPPORT uid_t rcs_owner = (uid_t) -1; @@ -7457,7 +7456,7 @@ for (ln = 0; ln < headlines.nlines; ++ln) { - char buf[80]; + char *buf; /* Period which separates year from month in date. */ char *ym; /* Period which separates month from day in date. */ @@ -7468,10 +7467,12 @@ if (prvers == NULL) prvers = vers; + buf = xmalloc (strlen (prvers->version) + 24); sprintf (buf, "%-12s (%-8.8s ", prvers->version, prvers->author); cvs_output (buf, 0); + free (buf); /* Now output the date. */ ym = strchr (prvers->date, '.'); ==== //depot/projects/ia64/games/factor/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.9 2004/12/21 10:15:59 ru Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.10 2005/04/22 18:57:32 trhodes Exp $ PROG= factor SRCS= factor.c pr_tbl.c @@ -7,8 +7,8 @@ .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL +DPADD= ${LIBCRYPTO} LDADD= -lcrypto -DPADD= ${LIBCRYPTO} .endif MAN= factor.6 ==== //depot/projects/ia64/gnu/lib/libdialog/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.41 2004/12/21 12:05:10 ru Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.42 2005/04/22 18:57:32 trhodes Exp $ LIB= dialog INCS= dialog.h @@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE +DPADD= ${LIBNCURSES} LDADD= -lncurses -DPADD= ${LIBNCURSES} .if !defined(NO_HTML) FILES= ${EXAMPLES:C;^;${.CURDIR}/TESTS/;} ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.54 2005/01/26 13:56:27 kan Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55 2005/04/22 18:57:32 trhodes Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -17,8 +17,8 @@ CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated +DPADD= ${LIBM} LDADD= -lm -DPADD= ${LIBM} # libstdc++ sources SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \ ==== //depot/projects/ia64/lib/libatm/Makefile#7 (text+ko) ==== @@ -21,15 +21,15 @@ # notice must be reproduced on all copies. # # @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $ -# $FreeBSD: src/lib/libatm/Makefile,v 1.11 2004/05/14 13:31:20 cognet Exp $ +# $FreeBSD: src/lib/libatm/Makefile,v 1.12 2005/04/22 18:57:31 trhodes Exp $ LIB= atm SHLIBDIR?= /lib SRCS= atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c INCS= libatm.h +DPADD= ${LIBMD} LDADD= -lmd -DPADD= ${LIBMD} .if ${MACHINE_ARCH} == "arm" WARNS?= 3 ==== //depot/projects/ia64/lib/libopie/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for libopie # -# $FreeBSD: src/lib/libopie/Makefile,v 1.19 2004/10/01 15:38:07 kensmith Exp $ +# $FreeBSD: src/lib/libopie/Makefile,v 1.20 2005/04/22 18:57:31 trhodes Exp $ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} @@ -26,8 +26,8 @@ ACCESSFILE?= \"/etc/opieaccess\" CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE} +DPADD= ${LIBMD} LDADD= -lmd -DPADD= ${LIBMD} MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 ==== //depot/projects/ia64/lib/libutil/login_cap.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.32 2004/05/11 11:05:26 dds Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.33 2005/04/22 23:11:57 trhodes Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -341,7 +341,7 @@ /* * login_getcapstr() * Given a login_cap entry, and a capability name, return the - * value defined for that capability, a defualt if not found, or + * value defined for that capability, a default if not found, or * an error string on error. */ ==== //depot/projects/ia64/lib/msun/src/s_ceill.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.1 2005/01/13 09:11:40 stefanf Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -50,6 +50,8 @@ } while (0) #endif +static const double huge = 1.0e300; + long double ceill(long double x) { @@ -58,13 +60,14 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - if (u.bits.exp > 0 || (u.bits.manh | u.bits.manl) != 0) - u.e = u.bits.sign ? 0.0 : 1.0; + if (huge + (double)x > 0.0) + if (u.bits.exp > 0 || + (u.bits.manh | u.bits.manl) != 0) + u.e = u.bits.sign ? 0.0 : 1.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (!u.bits.sign) { #ifdef LDBL_IMPLICIT_NBIT if (e == 0) @@ -73,14 +76,15 @@ #endif INC_MANH(u, 1llu << (MANH_SIZE - e - 1)); } - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (!u.bits.sign) { if (e == MANH_SIZE - 1) INC_MANH(u, 1); @@ -91,7 +95,8 @@ INC_MANH(u, 1); } } - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/lib/msun/src/s_floorl.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.1 2005/01/12 22:10:46 stefanf Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -50,6 +50,8 @@ } while (0) #endif +static const double huge = 1.0e300; + long double floorl(long double x) { @@ -58,13 +60,14 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - if (u.bits.exp > 0 || (u.bits.manh | u.bits.manl) != 0) - u.e = u.bits.sign ? -1.0 : 0.0; + if (huge + (double)x > 0.0) + if (u.bits.exp > 0 || + (u.bits.manh | u.bits.manl) != 0) + u.e = u.bits.sign ? -1.0 : 0.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (u.bits.sign) { #ifdef LDBL_IMPLICIT_NBIT if (e == 0) @@ -73,14 +76,15 @@ #endif INC_MANH(u, 1llu << (MANH_SIZE - e - 1)); } - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (u.bits.sign) { if (e == MANH_SIZE - 1) INC_MANH(u, 1); @@ -91,7 +95,8 @@ INC_MANH(u, 1); } } - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/lib/msun/src/s_truncl.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.1 2005/04/16 21:12:47 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -36,6 +36,8 @@ #define MANH_SIZE LDBL_MANH_SIZE #endif +static const double huge = 1.0e300; + long double truncl(long double x) { @@ -44,19 +46,23 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - u.e = 0.0; + if (huge + (double)x > 0.0) + u.e = 0.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/share/man/man4/acpi.4#26 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.50 2005/02/23 07:23:35 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.51 2005/04/22 23:21:09 njl Exp $ .\" .Dd February 13, 2005 .Dt ACPI 4 @@ -99,6 +99,11 @@ Name of the DSDT table to load, if loading is enabled. .It Va debug.acpi.disabled Selectively disables portions of ACPI for debugging purposes. +.It Va debug.acpi.max_threads +Specify the number of task threads that are started on boot. +Limiting this to 1 may help work around various BIOSes that cannot +handle parallel requests. +The default value is 3. .It Va debug.acpi.quirks Override any automatic quirks completely. .It Va hint.acpi.0.disabled ==== //depot/projects/ia64/sys/conf/files#131 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1015 2005/04/19 04:01:23 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1016 2005/04/22 20:00:41 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -19,19 +19,39 @@ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" -aic7xxx_{seq.h,reg.h,reg_print.c} optional ahc \ - compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ - no-obj no-implicit-rule before-depend \ - clean "aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c" \ +aic7xxx_seq.h optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic7xxx_seq.h" \ + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic7xxx_reg.h optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic7xxx_reg.h" \ + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic7xxx_reg_print.c optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule local \ + clean "aic7xxx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -aic79xx_{seq.h,reg.h,reg_print.c} optional ahd pci \ +aic79xx_seq.h optional ahd pci \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic79xx_seq.h" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic79xx_reg.h optional ahd pci \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic79xx_reg.h" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic79xx_reg_print.c optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ - no-obj no-implicit-rule before-depend \ - clean "aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c" \ - dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" + no-obj no-implicit-rule local \ + clean "aic79xx_reg_print.c" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local ==== //depot/projects/ia64/sys/conf/files.amd64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.62 2005/04/19 04:01:23 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.63 2005/04/22 19:55:52 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,7 +65,8 @@ os+%DIKED-nve.h optional nve pci \ dependency "$S/contrib/dev/nve/os.h" \ compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \ - no-implicit-rule no-obj before-depend + no-implicit-rule no-obj before-depend \ + clean "os+%DIKED-nve.h" # amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi ==== //depot/projects/ia64/sys/conf/files.i386#66 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.528 2005/04/19 21:40:07 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.529 2005/04/22 19:55:52 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,7 +69,8 @@ os+%DIKED-nve.h optional nve pci \ dependency "$S/contrib/dev/nve/os.h" \ compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \ - no-implicit-rule no-obj before-depend + no-implicit-rule no-obj before-depend \ + clean "os+%DIKED-nve.h" # hptmvraid.o optional hptmv \ dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ ==== //depot/projects/ia64/sys/conf/kern.post.mk#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.78 2005/04/03 04:33:42 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.80 2005/04/22 19:58:22 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -109,8 +109,8 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ - vers.c vnode_if.c vnode_if.h \ + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \ + vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} @@ -138,17 +138,12 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -kernel-depend: - rm -f .olddep - if [ -f .depend ]; then mv .depend .olddep; fi - ${MAKE} _kernel-depend - +kernel-depend: .depend # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ +.depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} - if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS} ==== //depot/projects/ia64/sys/conf/kmod.mk#46 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.190 2005/04/19 18:29:11 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.192 2005/04/22 17:39:58 ru Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -195,7 +195,6 @@ all: objwarn ${PROG} beforedepend: ${_ILINKS} -beforedepend: cleandepend # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. @@ -400,6 +399,20 @@ ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks .endif +.if ${SRCS:Massym.s} != "" +CLEANFILES+= assym.s genassym.o +assym.s: genassym.o +.if !exists(@) +assym.s: @ +.else +assym.s: @/kern/genassym.sh +.endif + sh @/kern/genassym.sh genassym.o > ${.TARGET} +genassym.o: @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c @ machine + ${CC} -c ${CFLAGS:N-fno-common} \ + @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c +.endif + lint: ${SRCS} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} ==== //depot/projects/ia64/sys/contrib/pf/net/pf.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.27 2005/04/13 21:05:55 glebius Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.28 2005/04/22 09:53:46 glebius Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ /* add $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ @@ -4065,9 +4065,9 @@ (*state)->dst.seqdiff = (*state)->src.seqhi - (*state)->dst.seqlo; (*state)->src.seqhi = (*state)->src.seqlo + + (*state)->dst.max_win; + (*state)->dst.seqhi = (*state)->dst.seqlo + (*state)->src.max_win; - (*state)->dst.seqhi = (*state)->dst.seqlo + - (*state)->dst.max_win; (*state)->src.wscale = (*state)->dst.wscale = 0; (*state)->src.state = (*state)->dst.state = TCPS_ESTABLISHED; ==== //depot/projects/ia64/sys/dev/fxp/if_fxp.c#59 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.232 2005/04/21 19:34:57 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.233 2005/04/22 13:05:53 mux Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -579,7 +579,9 @@ * too, but that's already enabled by the code above. * Be careful to do this only on the right devices. */ - if (sc->revision >= FXP_REV_82550) { + if (sc->revision == FXP_REV_82550 || sc->revision == FXP_REV_82550_C || + sc->revision == FXP_REV_82551_E || sc->revision == FXP_REV_82551_F + || sc->revision == FXP_REV_82551_10) { sc->rfa_size = sizeof (struct fxp_rfa); sc->tx_cmd = FXP_CB_COMMAND_IPCBXMIT; sc->flags |= FXP_FLAG_EXT_RFA; @@ -2643,7 +2645,7 @@ D102_B_CPUSAVER_DWORD, D102_B_CPUSAVER_BUNDLE_MAX_DWORD }, { FXP_REV_82550_C, UCODE(fxp_ucode_d102c), D102_C_CPUSAVER_DWORD, D102_C_CPUSAVER_BUNDLE_MAX_DWORD }, - { FXP_REV_82551, UCODE(fxp_ucode_d102e), + { FXP_REV_82551_F, UCODE(fxp_ucode_d102e), D102_E_CPUSAVER_DWORD, D102_E_CPUSAVER_BUNDLE_MAX_DWORD }, { 0, NULL, 0, 0, 0 } }; ==== //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#10 (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/fxp/if_fxpreg.h,v 1.38 2005/04/21 19:34:57 mux Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.39 2005/04/22 13:05:53 mux Exp $ */ #define FXP_VENDORID_INTEL 0x8086 @@ -468,4 +468,6 @@ #define FXP_REV_82559S_A 9 /* 82559S A stepping */ #define FXP_REV_82550 12 #define FXP_REV_82550_C 13 /* 82550 C stepping */ -#define FXP_REV_82551 15 /* 82551 */ +#define FXP_REV_82551_E 14 /* 82551 */ +#define FXP_REV_82551_F 15 /* 82551 */ +#define FXP_REV_82551_10 16 /* 82551 */ ==== //depot/projects/ia64/sys/dev/puc/pucdata.c#30 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.50 2005/02/09 18:38:28 wilko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.51 2005/04/22 07:49:35 imp Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -846,6 +846,15 @@ * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. */ + /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ + { "Oxford Semiconductor OX12PCI840 Parallel port", + { 0x1415, 0x8403, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* Oxford Semiconductor OX16PCI954 PCI UARTs */ { "Oxford Semiconductor OX16PCI954 UARTs", { 0x1415, 0x9501, 0, 0 }, @@ -870,24 +879,15 @@ }, }, - /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ - { "Oxford Semiconductor OX16PCI954 Parallel port", - { 0x1415, 0x9513, 0, 0 }, + /* Oxford Semiconductor OXCB950 PCI/CardBus UARTs */ + { "Oxford Semiconductor OXCB950 UART", + { 0x1415, 0x950b, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, }, }, - /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ - { "Oxford Semiconductor OX12PCI840 Parallel port", - { 0x1415, 0x8403, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, - }, - }, - /* * Oxford Semiconductor OX9160/OX16PCI954 PCI UARTS * Second chip on Exsys EX-41098 8x cards @@ -903,6 +903,15 @@ }, }, + /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ + { "Oxford Semiconductor OX16PCI954 Parallel port", + { 0x1415, 0x9513, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* NetMos 2S1P PCI 16C650 : 2S, 1P */ { "NetMos NM9835 Dual UART and 1284 Printer port", { 0x9710, 0x9835, 0, 0 }, ==== //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#19 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.86 2005/03/17 12:00:05 jeff Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.87 2005/04/22 22:42:44 jeff Exp $ */ /* @@ -530,7 +530,7 @@ * vop lock. */ if (nn != NULL && (lvp = NULLVPTOLOWERVP(vp)) != NULL) { - VI_LOCK(lvp); + VI_LOCK_FLAGS(lvp, MTX_DUPOK); VI_UNLOCK(vp); /* * We have to hold the vnode here to solve a potential ==== //depot/projects/ia64/sys/i386/acpica/acpi_wakecode.S#6 (text+ko) ==== @@ -24,15 +24,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.9 2004/01/01 22:57:22 njl Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.10 2005/04/22 09:53:04 iedowse Exp $ */ #define LOCORE #include <machine/asmacros.h> -#include <machine/param.h> #include <machine/specialreg.h> +#include "assym.s" + .align 4 .code16 wakeup_16: @@ -99,7 +100,7 @@ wakeup_sw32: /* Switch to protected mode by intersegmental jump */ - ljmpl $0x8,$0x12345678 /* Code location, to be replaced */ + ljmpl $KCSEL,$0x12345678 /* Code location, to be replaced */ .code32 wakeup_32: @@ -111,12 +112,12 @@ nop /* Set up segment registers for protected mode */ - movw $0x10,%ax /* KDSEL to segment registers */ + movw $KDSEL,%ax /* KDSEL to segment registers */ movw %ax,%ds movw %ax,%es movw %ax,%gs movw %ax,%ss - movw $0x18,%ax /* KPSEL to %fs */ + movw $KPSEL,%ax /* KPSEL to %fs */ movw %ax,%fs movl %esi,%esp /* physical address stack pointer */ ==== //depot/projects/ia64/sys/kern/kern_mac.c#39 (text+ko) ==== @@ -38,11 +38,12 @@ * Framework for extensible kernel access control. This file contains * Kernel and userland interface to the framework, policy registration * and composition. Per-object interfaces, controls, and labeling may be - * found in src/sys/mac/. Sample policies may be found in src/sys/mac*. + * found in src/sys/security/mac/. Sample policies may be found in + * src/sys/security/mac_*. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.116 2005/04/16 18:33:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.117 2005/04/22 19:09:12 trhodes Exp $"); #include "opt_mac.h" #include "opt_devfs.h" ==== //depot/projects/ia64/sys/kern/subr_witness.c#53 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.192 2005/04/12 22:07:11 vkashyap Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.194 2005/04/22 22:43:31 jeff Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -333,8 +333,10 @@ /* * CDEV */ + { "system map", &lock_class_mtx_sleep }, + { "vm page queue mutex", &lock_class_mtx_sleep }, + { "vnode interlock", &lock_class_mtx_sleep }, { "cdev", &lock_class_mtx_sleep }, - { "system map", &lock_class_mtx_sleep }, { NULL, NULL }, /* * spin locks @@ -791,7 +793,8 @@ lock1 = &(*lock_list)->ll_children[(*lock_list)->ll_count - 1]; w1 = lock1->li_lock->lo_witness; if (w1 == w) { - if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK)) + if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK) || + (flags & LOP_DUPOK)) return; w->w_same_squawked = 1; printf("acquiring duplicate lock of same type: \"%s\"\n", ==== //depot/projects/ia64/sys/modules/Makefile#86 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.442 2005/04/20 22:03:33 marcel Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.443 2005/04/22 07:59:50 imp Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -184,6 +184,7 @@ procfs \ pseudofs \ ${_pst} \ + ${_puc} \ ral \ ${_random} \ ${_ray} \ @@ -200,6 +201,7 @@ scd \ ${_scsi_low} \ sf \ + ${_sio} \ sis \ sk \ ${_smbfs} \ @@ -346,10 +348,12 @@ _pcfclock= pcfclock _pecoff= pecoff _pst= pst +_puc= puc _ray= ray _safe= safe _sbni= sbni _scsi_low= scsi_low +_sio= sio _smbfs= smbfs _sound= sound _speaker= speaker @@ -462,7 +466,6 @@ _iir= iir _mly= mly _pccard= pccard -_ray= ray _scsi_low= scsi_low _smbfs= smbfs _sound= sound ==== //depot/projects/ia64/sys/modules/acpi/acpi/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.9 2005/02/24 20:48:06 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.10 2005/04/22 09:53:03 iedowse Exp $ .PATH: ${.CURDIR}/../../../contrib/dev/acpica \ ${.CURDIR}/../../../pci \ @@ -77,11 +77,11 @@ # Machine-specific code such as sleep/wakeup SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c .if ${MACHINE} == "i386" -SRCS+= madt.c +SRCS+= madt.c assym.s .endif CLEANFILES+= acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin ${DBSRC:.c=.o} -acpi_wakecode.h: acpi_wakecode.S +acpi_wakecode.h: acpi_wakecode.S assym.s ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ MAKESRCPATH=${.CURDIR}/../../../${MACHINE_ARCH}/acpica >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504230149.j3N1nWrJ023194>