Date: Fri, 30 Aug 2002 14:10:57 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 16819 for review Message-ID: <200208302110.g7ULAvTU033623@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16819 Change 16819 by julian@julian_ref on 2002/08/30 14:10:24 IFC automatic part Affected files ... .. //depot/projects/kse/lib/libc/locale/collate.c#3 integrate .. //depot/projects/kse/lib/libc/locale/collate.h#3 integrate .. //depot/projects/kse/lib/libc/string/ffs.3#2 integrate .. //depot/projects/kse/lib/libc/string/ffs.c#2 integrate .. //depot/projects/kse/lib/libc/string/index.3#2 integrate .. //depot/projects/kse/lib/libc/string/index.c#2 integrate .. //depot/projects/kse/lib/libc/string/rindex.3#2 integrate .. //depot/projects/kse/lib/libc/string/rindex.c#2 integrate .. //depot/projects/kse/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/kse/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/swab.c#2 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#21 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#40 integrate .. //depot/projects/kse/sys/alpha/include/md_var.h#7 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#14 integrate .. //depot/projects/kse/sys/boot/common/loader.8#14 integrate .. //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#5 integrate .. //depot/projects/kse/sys/boot/i386/loader/Makefile#11 integrate .. //depot/projects/kse/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_resource.c#6 integrate .. //depot/projects/kse/sys/conf/majors#12 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#23 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/kse/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/fc_log.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/kse/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/kse/sys/i386/include/md_var.h#13 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#36 integrate .. //depot/projects/kse/sys/ia64/include/md_var.h#9 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#22 integrate .. //depot/projects/kse/sys/kern/subr_param.c#11 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#31 integrate .. //depot/projects/kse/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#22 integrate .. //depot/projects/kse/sys/sparc64/include/md_var.h#12 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#36 integrate .. //depot/projects/kse/sys/sys/buf.h#16 integrate .. //depot/projects/kse/sys/sys/systm.h#30 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/kse/sys/vm/vm_init.c#5 integrate Differences ... ==== //depot/projects/kse/lib/libc/locale/collate.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.28 2002/08/13 14:55:17 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.29 2002/08/30 20:26:02 ache Exp $"); #include "namespace.h" #include <rune.h> @@ -49,7 +49,7 @@ u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; -struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; +struct __collate_st_chain_pri *__collate_chain_pri_table; void __collate_err(int ex, const char *f) __dead2; @@ -57,9 +57,8 @@ __collate_load_tables(const char *encoding) { FILE *fp; - int i, saverr; - char collate_version[STR_LEN]; - char buf[PATH_MAX]; + int i, saverr, chains; + char strbuf[STR_LEN], buf[PATH_MAX]; void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; static char collate_encoding[ENCODING_LEN + 1]; @@ -90,6 +89,37 @@ if ((fp = fopen(buf, "r")) == NULL) return (_LDP_ERROR); + if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { + saverr = errno; + (void)fclose(fp); + errno = saverr; + return (_LDP_ERROR); + } + chains = -1; + if (strcmp(strbuf, COLLATE_VERSION) == 0) + chains = 0; + else if (strcmp(strbuf, COLLATE_VERSION1_1) == 0) + chains = 1; + if (chains < 0) { + (void)fclose(fp); + errno = EFTYPE; + return (_LDP_ERROR); + } + if (chains) { + if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { + saverr = errno; + (void)fclose(fp); + errno = saverr; + return (_LDP_ERROR); + } + if ((chains = atoi(strbuf)) < 1) { + (void)fclose(fp); + errno = EFTYPE; + return (_LDP_ERROR); + } + } else + chains = TABLE_SIZE; + if ((TMP_substitute_table = malloc(sizeof(__collate_substitute_table))) == NULL) { saverr = errno; @@ -106,7 +136,7 @@ return (_LDP_ERROR); } if ((TMP_chain_pri_table = - malloc(sizeof(__collate_chain_pri_table))) == NULL) { + malloc(sizeof(*__collate_chain_pri_table) * chains)) == NULL) { saverr = errno; free(TMP_substitute_table); free(TMP_char_pri_table); @@ -128,18 +158,10 @@ } \ } - FREAD(collate_version, sizeof(collate_version), 1, fp); - if (strcmp(collate_version, COLLATE_VERSION) != 0) { - free(TMP_substitute_table); - free(TMP_char_pri_table); - free(TMP_chain_pri_table); - (void)fclose(fp); - errno = EFTYPE; - return (_LDP_ERROR); - } FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp); FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp); - FREAD(TMP_chain_pri_table, sizeof(__collate_chain_pri_table), 1, fp); + FREAD(TMP_chain_pri_table, + sizeof(*__collate_chain_pri_table) * chains, 1, fp); (void)fclose(fp); (void)strcpy(collate_encoding, encoding); @@ -149,9 +171,9 @@ if (__collate_char_pri_table_ptr != NULL) free(__collate_char_pri_table_ptr); __collate_char_pri_table_ptr = TMP_char_pri_table; - if (__collate_chain_pri_table_ptr != NULL) - free(__collate_chain_pri_table_ptr); - __collate_chain_pri_table_ptr = TMP_chain_pri_table; + if (__collate_chain_pri_table != NULL) + free(__collate_chain_pri_table); + __collate_chain_pri_table = TMP_chain_pri_table; __collate_substitute_nontrivial = 0; for (i = 0; i < UCHAR_MAX + 1; i++) { @@ -203,8 +225,9 @@ *len = 1; *prim = *sec = 0; - for (p2 = __collate_chain_pri_table; p2->str[0]; p2++) { - if (strncmp(t, p2->str, strlen(p2->str)) == 0) { + for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++) { + if (*t == p2->str[0] && + strncmp(t, p2->str, strlen(p2->str)) == 0) { *len = strlen(p2->str); *prim = p2->prim; *sec = p2->sec; ==== //depot/projects/kse/lib/libc/locale/collate.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/collate.h,v 1.13 2002/08/13 14:55:17 ache Exp $ + * $FreeBSD: src/lib/libc/locale/collate.h,v 1.14 2002/08/30 20:26:02 ache Exp $ */ #ifndef _COLLATE_H_ @@ -36,7 +36,8 @@ #define STR_LEN 10 #define TABLE_SIZE 100 -#define COLLATE_VERSION "1.0\n" +#define COLLATE_VERSION "1.0\n" +#define COLLATE_VERSION1_1 "1.1\n" struct __collate_st_char_pri { int prim, sec; @@ -52,8 +53,7 @@ extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; #define __collate_char_pri_table (*__collate_char_pri_table_ptr) extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; -#define __collate_chain_pri_table (*__collate_chain_pri_table_ptr) -extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; +extern struct __collate_st_chain_pri *__collate_chain_pri_table; __BEGIN_DECLS u_char *__collate_strdup(u_char *); ==== //depot/projects/kse/lib/libc/string/ffs.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.5 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.6 2002/08/30 19:08:53 robert Exp $ .\" .Dd April 19, 1994 .Dt FFS 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft int .Fn ffs "int value" .Sh DESCRIPTION @@ -62,3 +62,10 @@ .Fn ffs function appeared in .Bx 4.3 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/ffs.c#2 (text+ko) ==== @@ -35,16 +35,15 @@ static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.5 2002/08/30 19:08:53 robert Exp $"); -#include <string.h> +#include <strings.h> /* * ffs -- vax ffs instruction */ int -ffs(mask) - int mask; +ffs(int mask) { int bit; ==== //depot/projects/kse/lib/libc/string/index.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)index.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/index.3,v 1.6 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/index.3,v 1.7 2002/08/30 19:42:07 robert Exp $ .\" .Dd June 4, 1993 .Dt INDEX 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft char * .Fn index "const char *s" "int c" .Sh DESCRIPTION @@ -81,3 +81,10 @@ .Fn index function appeared in .At v6 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/index.c#2 (text+ko) ==== @@ -35,24 +35,28 @@ static char sccsid[] = "@(#)index.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.5 2002/08/30 19:42:07 robert Exp $"); + +#include <stddef.h> +#ifdef STRCHR #include <string.h> -#include <stddef.h> char * -#ifdef STRCHR -strchr(p, ch) +strchr #else -index(p, ch) +#include <strings.h> + +char * +index #endif - const char *p, ch; +(const char *p, int ch) { for (;; ++p) { if (*p == ch) - return((char *)p); - if (!*p) - return((char *)NULL); + return ((char *)p); + if (*p == '\0') + return (NULL); } /* NOTREACHED */ } ==== //depot/projects/kse/lib/libc/string/rindex.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rindex.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/rindex.3,v 1.6 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/rindex.3,v 1.7 2002/08/30 19:42:07 robert Exp $ .\" .Dd June 4, 1993 .Dt RINDEX 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft char * .Fn rindex "const char *s" "int c" .Sh DESCRIPTION @@ -83,3 +83,10 @@ .Fn rindex function appeared in .At v6 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/rindex.c#2 (text+ko) ==== @@ -35,27 +35,30 @@ static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.5 2002/08/30 19:42:07 robert Exp $"); #include <stddef.h> + +#ifdef STRRCHR #include <string.h> char * -#ifdef STRRCHR -strrchr(p, ch) +strrchr #else -rindex(p, ch) +#include <strings.h> + +char * +rindex #endif - const char *p; - int ch; +(const char *p, int ch) { char *save; for (save = NULL;; ++p) { if (*p == ch) save = (char *)p; - if (!*p) - return(save); + if (*p == '\0') + return (save); } /* NOTREACHED */ } ==== //depot/projects/kse/lib/libc/string/strcasecmp.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcasecmp.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.9 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.10 2002/08/30 15:40:01 robert Exp $ .\" .Dd June 9, 1993 .Dt STRCASECMP 3 @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft int .Fn strcasecmp "const char *s1" "const char *s2" .Ft int @@ -95,3 +95,10 @@ .Fn strncasecmp functions first appeared in .Bx 4.4 . +Their prototypes existed previously in +.Aq Pa string.h +before they were moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/strcasecmp.c#2 (text+ko) ==== @@ -35,9 +35,9 @@ static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.6 2002/08/30 15:40:01 robert Exp $"); -#include <string.h> +#include <strings.h> #include <ctype.h> typedef unsigned char u_char; ==== //depot/projects/kse/lib/libc/string/swab.c#2 (text+ko) ==== @@ -38,29 +38,25 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); #include <string.h> void -swab(from, to, len) - const void *from; - void *to; - size_t len; +swab(const void * __restrict from, void * __restrict to, size_t len) { unsigned long temp; int n; char *fp, *tp; - n = (len >> 1) + 1; + n = len >> 1; fp = (char *)from; tp = (char *)to; #define STEP temp = *fp++,*tp++ = *fp++,*tp++ = temp /* round to multiple of 8 */ - while ((--n) & 07) + for (; n & 0x7; --n) STEP; - n >>= 3; - while (--n >= 0) { + for (n >>= 3; n > 0; --n) { STEP; STEP; STEP; STEP; STEP; STEP; STEP; STEP; } ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#21 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.54 2002/08/30 02:18:38 peter Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.54 2002/08/30 02:18:38 peter Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -331,7 +331,7 @@ if (proc.p_state != PRS_ZOMBIE) { kp->ki_pctcpu = proc.p_kse.ke_pctcpu; kp->ki_estcpu = proc.p_ksegrp.kg_estcpu; - kp->ki_slptime = proc.p_kse.ke_slptime; + kp->ki_slptime = proc.p_ksegrp.kg_slptime; kp->ki_swtime = proc.p_swtime; kp->ki_flag = proc.p_flag; kp->ki_sflag = proc.p_sflag; ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#40 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.181 2002/08/29 06:17:46 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.182 2002/08/30 04:04:33 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -189,13 +189,13 @@ struct msgbuf *msgbufp=0; -int Maxmem = 0; +long Maxmem = 0; -int totalphysmem; /* total amount of physical memory in system */ -int physmem; /* physical memory used by NetBSD + some rsvd */ -int resvmem; /* amount of memory reserved for PROM */ -int unusedmem; /* amount of memory for OS that we don't use */ -int unknownmem; /* amount of memory with an unknown use */ +long totalphysmem; /* total amount of physical memory in system */ +long physmem; /* physical memory used by NetBSD + some rsvd */ +long resvmem; /* amount of memory reserved for PROM */ +long unusedmem; /* amount of memory for OS that we don't use */ +long unknownmem; /* amount of memory with an unknown use */ int ncpus; /* number of cpus */ vm_offset_t phys_avail[10]; @@ -203,23 +203,30 @@ static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, alpha_ptob(physmem), req); + int error; + unsigned long val; + + val = alpha_ptob(physmem); + error = sysctl_handle_long(oidp, &val, 0, req); return (error); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "I", ""); +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, + 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, - alpha_ptob(physmem - cnt.v_wire_count), req); + int error; + unsigned long val; + + val = alpha_ptob(physmem - cnt.v_wire_count); + error = sysctl_handle_long(oidp, &val, 0, req); return (error); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "I", ""); +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, + 0, 0, sysctl_hw_usermem, "LU", ""); SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); ==== //depot/projects/kse/sys/alpha/include/md_var.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.19 2002/03/20 18:58:45 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.20 2002/08/30 04:04:34 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,7 +36,7 @@ extern char sigcode[]; extern char esigcode[]; extern int szsigcode; -extern int Maxmem; +extern long Maxmem; extern int busdma_swi_pending; struct fpreg; ==== //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.32 2002/08/16 12:51:51 rwatson Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.33 2002/08/30 04:04:34 peter Exp $ */ @@ -256,7 +256,7 @@ return open(td, &a); } -extern int totalphysmem; +extern long totalphysmem; int osf1_getsysinfo(td, uap) ==== //depot/projects/kse/sys/boot/common/loader.8#14 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.46 2002/08/13 15:06:48 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.47 2002/08/30 11:10:59 iwasaki Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -313,7 +313,7 @@ .It Va acpi_load Unset this to disable automatic loading of the ACPI module. See also -.Va hint.acpi.0.disable +.Va hint.acpi.0.disabled in .Xr device.hints 5 . .It Va autoboot_delay ==== //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.7 2002/08/09 06:07:33 obrien Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ */ /* @@ -49,7 +49,7 @@ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); ==== //depot/projects/kse/sys/boot/i386/loader/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.61 2002/08/29 23:37:44 peter Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.62 2002/08/30 14:59:47 jhb Exp $ BASE= loader PROG= ${BASE} @@ -89,7 +89,7 @@ ${CC} -c vers.c ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} - btxld -v -f elf -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ + btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${BASE}.bin # /usr/bin/kzip ${.TARGET} # mv ${.TARGET}.kz ${.TARGET} ==== //depot/projects/kse/sys/boot/i386/loader/help.i386#4 (text+ko) ==== @@ -7,7 +7,7 @@ unset acpi_load - $hint.acpi.0.disable="1" + $hint.acpi.0.disabled="1" If set, the ACPI module won't be loaded. ==== //depot/projects/kse/sys/compat/svr4/svr4_misc.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.49 2002/08/15 15:46:10 rwatson Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.50 2002/08/30 18:09:46 dillon Exp $ */ /* @@ -846,10 +846,9 @@ if (new > old) { vm_size_t diff; - if (swap_pager_full) { - return (ENOMEM); - } diff = new - old; + if (vm->vm_map.size + diff > p->p_rlimit[RLIMIT_VMEM].rlim_cur) + return(ENOMEM); rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { ==== //depot/projects/kse/sys/compat/svr4/svr4_resource.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.10 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.11 2002/08/30 18:09:46 dillon Exp $ */ /* @@ -108,7 +108,7 @@ case SVR4_RLIMIT_NOFILE: return RLIMIT_NOFILE; case SVR4_RLIMIT_VMEM: - return RLIMIT_RSS; + return RLIMIT_VMEM; default: return -1; } ==== //depot/projects/kse/sys/conf/majors#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.138 2002/08/18 12:19:32 sos Exp $ +$FreeBSD: src/sys/conf/majors,v 1.139 2002/08/30 16:54:02 gibbs Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -186,6 +186,8 @@ 168 sab Siemens SAB82532 serial chip <jake> 169 ofwd OpenFirmware disk <benno> 170 pst Promise SuperTrak +171 mide LSI MegaRAID IDE (control device) +172 mided LSI MegaRAID IDE (disk device) 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 254 internal Used internally by the kernel ==== //depot/projects/kse/sys/dev/aac/aac.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.40 2002/08/17 02:36:15 rwatson Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.41 2002/08/30 05:02:07 scottl Exp $ */ /* @@ -1115,8 +1115,9 @@ /* allocate the FIBs in DMAable memory and load them */ if (bus_dmamem_alloc(sc->aac_fib_dmat, (void **)&sc->aac_fibs, - BUS_DMA_NOWAIT, &sc->aac_fibmap)) { - return(ENOMEM); + BUS_DMA_NOWAIT, &sc->aac_fibmap)) { + printf("Not enough contiguous memory available.\n"); + return (ENOMEM); } bus_dmamap_load(sc->aac_fib_dmat, sc->aac_fibmap, sc->aac_fibs, AAC_FIB_COUNT * sizeof(struct aac_fib), @@ -1132,7 +1133,7 @@ if (!bus_dmamap_create(sc->aac_buffer_dmat, 0, &cm->cm_datamap)) aac_release_command(cm); } - return(0); + return (0); } /* ==== //depot/projects/kse/sys/dev/acpica/acpi.c#27 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.71 2002/08/29 01:52:26 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.72 2002/08/30 11:11:07 iwasaki Exp $ */ #include "opt_acpi.h" @@ -2118,6 +2118,11 @@ static void acpi_pm_register(void *arg) { + int error; + + if (!resource_int_value("acpi", 0, "disabled", &error) && + (error != 0)) + return; power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL); } ==== //depot/projects/kse/sys/dev/amr/amr_pci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.9 2002/01/08 06:47:02 msmith Exp $ + * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.10 2002/08/30 18:28:00 gibbs Exp $ */ #include <sys/param.h> @@ -95,8 +95,10 @@ } amr_device_ids[] = { {0x101e, 0x9010, 0}, {0x101e, 0x9060, 0}, - {0x8086, 0x1960, PROBE_SIGNATURE}, /* generic i960RD, check for signature */ + {0x8086, 0x1960, PROBE_SIGNATURE},/* generic i960RD, check for signature */ {0x101e, 0x1960, 0}, + {0x1000, 0x1960, 0}, + {0x1000, 0x0407, 0}, {0, 0, 0} }; ==== //depot/projects/kse/sys/dev/mpt/mpilib/fc_log.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. All rights reserved. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * NAME: fc_log.h * SUMMARY: MPI IocLogInfo definitions for the SYMFC9xx chips @@ -11,7 +32,6 @@ * ID: $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $ */ - /* * MpiIocLogInfo_t enum * ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * * Name: MPI.H ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi_cnfg.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * * Name: MPI_CNFG.H ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi_fc.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208302110.g7ULAvTU033623>