PERFORCE change 33718 for review
Peter Wemm
peter at FreeBSD.org
Thu Jun 26 17:30:37 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=33718
Change 33718 by peter at peter_daintree on 2003/06/26 17:30:08
IFC @33716
Affected files ...
.. //depot/projects/hammer/etc/defaults/rc.conf#13 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#10 integrate
.. //depot/projects/hammer/etc/rc.d/watchdogd#1 branch
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/config.h#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#10 integrate
.. //depot/projects/hammer/lib/libc/locale/fix_grouping.c#2 integrate
.. //depot/projects/hammer/lib/libc/locale/ldpart.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/lmessages.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/lmonetary.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/lnumeric.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/localeconv.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/hammer/lib/libz/zlib.3#2 integrate
.. //depot/projects/hammer/release/Makefile#31 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#16 integrate
.. //depot/projects/hammer/share/man/man4/watchdog.4#1 branch
.. //depot/projects/hammer/sys/conf/NOTES#19 integrate
.. //depot/projects/hammer/sys/conf/options#17 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#10 integrate
.. //depot/projects/hammer/sys/modules/Makefile#20 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#11 integrate
.. //depot/projects/hammer/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/hammer/usr.bin/locale/locale.c#4 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#22 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.8#6 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.8#1 branch
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#1 branch
Differences ...
==== //depot/projects/hammer/etc/defaults/rc.conf#13 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.179 2003/06/14 22:26:30 mtm Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.180 2003/06/26 09:50:50 smkelly Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -430,6 +430,7 @@
jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
jail_sysvipc_allow="NO" # Allow SystemV IPC use from within a jail
+watchdogd_enable="NO" # Start the software watchdog daemon
##############################################################
### Define source_rc_confs, the mechanism used by /etc/rc.* ##
==== //depot/projects/hammer/etc/rc.d/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.18 2003/06/20 09:47:09 phk Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.19 2003/06/26 09:50:51 smkelly Exp $
.include <bsd.own.mk>
@@ -17,8 +17,8 @@
ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \
rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \
securelevel sendmail serial sppp sshd swap1 syscons sysctl \
- syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \
- ypset ypupdated ypxfrd
+ syslogd timed ttys usbd vinum virecover watchdogd ypbind \
+ yppasswdd ypserv ypset ypupdated ypxfrd
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */
#define HAVE_DECL_GETOPT 1
@@ -226,10 +226,10 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "alpha-obrien-freebsd5.0"
+#define TARGET_ALIAS "alpha-obrien-freebsd5"
/* Canonical target. */
-#define TARGET_CANONICAL "alpha-obrien-freebsd5.0"
+#define TARGET_CANONICAL "alpha-obrien-freebsd5"
/* Target CPU. */
#define TARGET_CPU "alpha"
@@ -238,7 +238,7 @@
#define TARGET_VENDOR "obrien"
/* Target OS. */
-#define TARGET_OS "freebsd5.0"
+#define TARGET_OS "freebsd5"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/config.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.9 2002/12/02 09:43:15 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/config.h,v 1.10 2003/06/26 16:13:36 obrien Exp $ */
#define HAVE_DECL_GETOPT 1
@@ -226,10 +226,10 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "i386-obrien-freebsd5.0"
+#define TARGET_ALIAS "i386-obrien-freebsd5"
/* Canonical target. */
-#define TARGET_CANONICAL "i386-obrien-freebsd5.0"
+#define TARGET_CANONICAL "i386-obrien-freebsd5"
/* Target CPU. */
#define TARGET_CPU "i386"
@@ -238,7 +238,7 @@
#define TARGET_VENDOR "obrien"
/* Target OS. */
-#define TARGET_OS "freebsd5.0"
+#define TARGET_OS "freebsd5"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.4 2002/10/20 07:50:18 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.5 2003/06/26 16:13:36 obrien Exp $ */
#define HAVE_DECL_GETOPT 1
@@ -229,10 +229,10 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "ia64-obrien-freebsd5.0"
+#define TARGET_ALIAS "ia64-obrien-freebsd5"
/* Canonical target. */
-#define TARGET_CANONICAL "ia64-obrien-freebsd5.0"
+#define TARGET_CANONICAL "ia64-obrien-freebsd5"
/* Target CPU. */
#define TARGET_CPU "ia64"
@@ -241,7 +241,7 @@
#define TARGET_VENDOR "obrien"
/* Target OS. */
-#define TARGET_OS "freebsd5.0"
+#define TARGET_OS "freebsd5"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.6 2002/10/20 07:50:18 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h,v 1.7 2003/06/26 16:13:36 obrien Exp $ */
#define HAVE_DECL_GETOPT 1
@@ -229,10 +229,10 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "powerpc-obrien-freebsd5.0"
+#define TARGET_ALIAS "powerpc-obrien-freebsd5"
/* Canonical target. */
-#define TARGET_CANONICAL "powerpc-obrien-freebsd5.0"
+#define TARGET_CANONICAL "powerpc-obrien-freebsd5"
/* Target CPU. */
#define TARGET_CPU "powerpc"
@@ -241,7 +241,7 @@
#define TARGET_VENDOR "obrien"
/* Target OS. */
-#define TARGET_OS "freebsd5.0"
+#define TARGET_OS "freebsd5"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.8 2002/12/02 09:43:15 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h,v 1.9 2003/06/26 16:13:36 obrien Exp $ */
#define HAVE_DECL_GETOPT 1
@@ -226,10 +226,10 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "sparc64-obrien-freebsd5.0"
+#define TARGET_ALIAS "sparc64-obrien-freebsd5"
/* Canonical target. */
-#define TARGET_CANONICAL "sparc64-obrien-freebsd5.0"
+#define TARGET_CANONICAL "sparc64-obrien-freebsd5"
/* Target CPU. */
#define TARGET_CPU "sparc64"
@@ -238,7 +238,7 @@
#define TARGET_VENDOR "obrien"
/* Target OS. */
-#define TARGET_OS "freebsd5.0"
+#define TARGET_OS "freebsd5"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.69 2003/06/26 03:02:32 peter Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.70 2003/06/26 20:34:08 peter Exp $
#
# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -144,7 +144,7 @@
echo 'typedef union tree_node *tree;' >> ${.TARGET}
echo '' >> ${.TARGET}
.if ${TARGET_ARCH} == "amd64"
- echo '#include "i386/biarch64.h" >> ${.TARGET}
+ echo '#include "i386/biarch64.h"' >> ${.TARGET}
.endif
.if ${TARGET_ARCH} == "ia64"
echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET}
==== //depot/projects/hammer/lib/libc/locale/fix_grouping.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.7 2002/03/22 21:52:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $");
#include <ctype.h>
#include <limits.h>
@@ -34,12 +34,15 @@
static const char nogrouping[] = { CHAR_MAX, '\0' };
/*
- * "3;3;-1" -> "\003\003\177"
+ * Internal helper used to convert grouping sequences from string
+ * representation into POSIX specified form, i.e.
+ *
+ * "3;3;-1" -> "\003\003\177\000"
*/
const char *
-__fix_locale_grouping_str(const char *str) {
-
+__fix_locale_grouping_str(const char *str)
+{
char *src, *dst;
char n;
==== //depot/projects/hammer/lib/libc/locale/ldpart.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.13 2003/06/13 00:14:07 jkh Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.14 2003/06/26 10:46:16 phantom Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -39,8 +39,8 @@
#include <unistd.h>
#include "un-namespace.h"
+#include "ldpart.h"
#include "setlocale.h"
-#include "ldpart.h"
static int split_lines(char *, const char *);
@@ -80,6 +80,7 @@
namesize = strlen(name) + 1;
/* 'PathLocale' must be already set & checked. */
+
/* Range checking not needed, 'name' size is limited */
strcpy(filename, _PathLocale);
strcat(filename, "/");
==== //depot/projects/hammer/lib/libc/locale/lmessages.c#3 (text+ko) ====
@@ -25,12 +25,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.13 2003/06/13 00:14:07 jkh Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.14 2003/06/26 10:46:16 phantom Exp $");
#include <stddef.h>
+#include "ldpart.h"
#include "lmessages.h"
-#include "ldpart.h"
#define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *))
#define LCMESSAGES_SIZE_MIN \
==== //depot/projects/hammer/lib/libc/locale/lmonetary.c#4 (text+ko) ====
@@ -25,13 +25,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.18 2003/06/13 00:14:07 jkh Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.19 2003/06/26 10:46:16 phantom Exp $");
#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
+
+#include "ldpart.h"
#include "lmonetary.h"
-#include "ldpart.h"
extern int __mlocale_changed;
extern const char * __fix_locale_grouping_str(const char *);
@@ -112,7 +113,7 @@
/*
* The six additional C99 international monetary formatting
* parameters default to the national parameters when
- * reading FreeBSD 4 LC_MONETARY data files.
+ * reading FreeBSD LC_MONETARY data files.
*/
#define M_ASSIGN_ICHAR(NAME) \
do { \
@@ -159,6 +160,12 @@
"n_sep_by_space = %d\n"
"p_sign_posn = %d\n"
"n_sign_posn = %d\n",
+ "int_p_cs_precedes = %d\n"
+ "int_p_sep_by_space = %d\n"
+ "int_n_cs_precedes = %d\n"
+ "int_n_sep_by_space = %d\n"
+ "int_p_sign_posn = %d\n"
+ "int_n_sign_posn = %d\n",
_monetary_locale.int_curr_symbol,
_monetary_locale.currency_symbol,
_monetary_locale.mon_decimal_point,
@@ -173,7 +180,13 @@
_monetary_locale.n_cs_precedes[0],
_monetary_locale.n_sep_by_space[0],
_monetary_locale.p_sign_posn[0],
- _monetary_locale.n_sign_posn[0]
+ _monetary_locale.n_sign_posn[0],
+ _monetary_locale.int_p_cs_precedes[0],
+ _monetary_locale.int_p_sep_by_space[0],
+ _monetary_locale.int_n_cs_precedes[0],
+ _monetary_locale.int_n_sep_by_space[0],
+ _monetary_locale.int_p_sign_posn[0],
+ _monetary_locale.int_n_sign_posn[0]
);
}
#endif /* LOCALE_DEBUG */
==== //depot/projects/hammer/lib/libc/locale/lnumeric.c#4 (text+ko) ====
@@ -25,11 +25,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.15 2003/06/13 00:14:07 jkh Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $");
#include <limits.h>
+
+#include "ldpart.h"
#include "lnumeric.h"
-#include "ldpart.h"
extern int __nlocale_changed;
extern const char *__fix_locale_grouping_str(const char *);
==== //depot/projects/hammer/lib/libc/locale/localeconv.c#3 (text+ko) ====
@@ -36,9 +36,10 @@
static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.12 2002/10/09 09:19:28 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
#include <locale.h>
+
#include "lmonetary.h"
#include "lnumeric.h"
==== //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom at FreeBSD.org>
+ * Copyright (c) 2001, 2003 Alexey Zelkin <phantom at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,24 +25,24 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.16 2003/06/10 01:26:04 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
-#include <locale.h>
#include <langinfo.h>
#include <limits.h>
+#include <locale.h>
#include <stdlib.h>
#include <string.h>
-#include "../stdtime/timelocal.h"
#include "lnumeric.h"
+#include "lmessages.h"
#include "lmonetary.h"
-#include "lmessages.h"
+#include "../stdtime/timelocal.h"
#define _REL(BASE) ((int)item-BASE)
char *
-nl_langinfo(nl_item item) {
-
+nl_langinfo(nl_item item)
+{
char *ret, *s, *cs;
static char *csym = NULL;
@@ -126,9 +126,9 @@
ret = (char*) __get_current_messages_locale()->noexpr;
break;
/*
- * All items marked with LEGACY are available, but not recomended
- * by SUSv2 to be used in portable applications since they're subject
- * to remove in future specification editions
+ * YESSTR and NOSTR items marked with LEGACY are available, but not
+ * recomended by SUSv2 to be used in portable applications since
+ * they're subject to remove in future specification editions.
*/
case YESSTR: /* LEGACY */
ret = (char*) __get_current_messages_locale()->yesstr;
@@ -136,6 +136,9 @@
case NOSTR: /* LEGACY */
ret = (char*) __get_current_messages_locale()->nostr;
break;
+ /*
+ * SUSv2 special formatted currency string
+ */
case CRNCYSTR:
ret = "";
cs = (char*) __get_current_monetary_locale()->currency_symbol;
@@ -162,7 +165,7 @@
}
}
break;
- case D_MD_ORDER: /* local extension */
+ case D_MD_ORDER: /* FreeBSD local extension */
ret = (char *) __get_current_time_locale()->md_order;
break;
default:
==== //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.2 2003/06/23 23:15:06 marcel Exp $
+# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.3 2003/06/26 05:40:15 marcel Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-SRCS+= thr_enter_uts.S thr_switch.S
+SRCS+= context.S enter_uts.S
==== //depot/projects/hammer/lib/libz/zlib.3#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/lib/libz/zlib.3,v 1.5 2002/03/11 22:36:26 green Exp $
+.\" $FreeBSD: src/lib/libz/zlib.3,v 1.6 2003/06/26 20:04:27 se Exp $
.\"
.TH ZLIB 3 "11 March 2002"
.SH NAME
@@ -69,7 +69,7 @@
or, if this fails, to the author addresses given below.
The zlib home page is:
.IP
-http://www.cdrom.com/pub/infozip/zlib/
+http://www.gzip.org/zlib/
.LP
The data format used by the zlib library is described by RFC
(Request for Comments) 1950 to 1952 in the files:
==== //depot/projects/hammer/release/Makefile#31 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.783 2003/06/26 00:55:33 peter Exp $
+# $FreeBSD: src/release/Makefile,v 1.785 2003/06/26 11:23:36 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -18,11 +18,11 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=5.0-RELEASE
+#BUILDNAME=5.1-RELEASE
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
-BASE = 5.0
+BASE = 5.1
BUILDNAME?=${BASE}-${DATE}-SNAP
#
#CHROOTDIR=/junk/release
@@ -277,9 +277,7 @@
FIXIT_TARGET=
.endif
-.if !defined(CRUNCH_TARGETS)
-CRUNCH_TARGETS= boot fixit
-.endif
+CRUNCH_TARGETS?=boot fixit
.if !defined(FIXIT_TARGET)
FIXIT_TARGET= release.10
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.578 2003/06/21 00:04:11 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.580 2003/06/26 21:22:00 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -123,7 +123,9 @@
<sect2 id="kernel">
<title>Kernel Changes</title>
- <para></para>
+ <para>A kernel software watchdog facility has been implemented.
+ For more information, see &man.watchdog.4; and
+ &man.watchdogd.8;.</para>
<!-- Above this line, sort kernel changes by manpage/keyword-->
@@ -152,9 +154,16 @@
<sect3 id="net-if">
<title>Network Interface Support</title>
+ <para>The new &man.ath.4; and &man.ath.hal.4; drivers provide
+ support for 802.11a/b/g devices based on the AR5210, AR5211,
+ and AR5212 chips.</para>
+
<para>A bug in the &man.bge.4; driver that prevented it from
working correctly at 10 Mbps has been fixed.</para>
+ <para>The 802.11 support layer has been rewritten to allow for
+ future growth and new features.</para>
+
</sect3>
<sect3 id="net-proto">
@@ -250,7 +259,7 @@
<quote>Digitalis</quote> release.</para>
<para><application>texinfo</application> has been updated from 4.5
- to 4.6.</para>
+ to 4.6. &merged;</para>
</sect2>
==== //depot/projects/hammer/share/man/man4/Makefile#16 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.212 2003/06/25 13:21:55 harti Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.213 2003/06/26 09:50:51 smkelly Exp $
MAN= aac.4 \
acpi.4 \
@@ -270,6 +270,7 @@
vlan.4 \
vpo.4 \
vr.4 \
+ watchdog.4 \
wb.4 \
wi.4 \
witness.4 \
==== //depot/projects/hammer/sys/conf/NOTES#19 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1155 2003/06/25 13:21:04 harti Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1156 2003/06/26 09:50:51 smkelly Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2065,6 +2065,13 @@
options HW_WDOG
#
+# Add software watchdog routines. This will add some sysctl OIDs that
+# can be used in combination with an external daemon to create a
+# software-based watchdog solution.
+#
+options WATCHDOG
+
+#
# Disable swapping of upages and stack pages. This option removes all
# code which actually performs swapping, so it's not possible to turn
# it back on at run-time.
==== //depot/projects/hammer/sys/conf/options#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.399 2003/06/25 14:51:20 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.400 2003/06/26 09:50:51 smkelly Exp $
#
# On the handling of kernel options
#
@@ -442,6 +442,7 @@
NPX_DEBUG opt_debug_npx.h
NETATALKDEBUG opt_atalk.h
SI_DEBUG opt_debug_si.h
+WATCHDOG opt_watchdog.h
# Fb options
FB_DEBUG opt_fb.h
==== //depot/projects/hammer/sys/dev/ep/if_ep.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
*/
/*
- * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.114 2003/03/29 22:27:41 mdodd Exp $
+ * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.117 2003/06/26 17:02:52 mux Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -480,28 +480,25 @@
ep_if_start(ifp)
struct ifnet *ifp;
{
- struct ep_softc *sc = ifp->if_softc;
+ struct ep_softc *sc;
u_int len;
- struct mbuf *m;
- struct mbuf *top;
+ struct mbuf *m, *m0;
int s, pad;
- if (sc->gone) {
+ sc = ifp->if_softc;
+ if (sc->gone)
return;
- }
while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS);
- if (ifp->if_flags & IFF_OACTIVE) {
+ if (ifp->if_flags & IFF_OACTIVE)
return;
- }
startagain:
/* Sneak a peek at the next packet */
- m = ifp->if_snd.ifq_head;
- if (m == 0) {
+ IF_DEQUEUE(&ifp->if_snd, m0);
+ if (m0 == NULL)
return;
- }
- for (len = 0, top = m; m; m = m->m_next)
+ for (len = 0, m = m0; m != NULL; m = m->m_next)
len += m->m_len;
pad = (4 - len) & 3;
@@ -513,9 +510,8 @@
*/
if (len + pad > ETHER_MAX_LEN) {
/* packet is obviously too large: toss it */
- ++ifp->if_oerrors;
- IF_DEQUEUE(&ifp->if_snd, m);
- m_freem(m);
+ ifp->if_oerrors++;
+ m_freem(m0);
goto readcheck;
}
if (inw(BASE + EP_W1_FREE_TX) < len + pad + 4) {
@@ -524,21 +520,20 @@
/* make sure */
if (inw(BASE + EP_W1_FREE_TX) < len + pad + 4) {
ifp->if_flags |= IFF_OACTIVE;
+ IF_PREPEND(&ifp->if_snd, m0);
return;
}
} else {
outw(BASE + EP_COMMAND, SET_TX_AVAIL_THRESH | EP_THRESH_DISABLE);
}
- IF_DEQUEUE(&ifp->if_snd, m);
-
s = splhigh();
outw(BASE + EP_W1_TX_PIO_WR_1, len);
outw(BASE + EP_W1_TX_PIO_WR_1, 0x0); /* Second dword meaningless */
if (EP_FTST(sc, F_ACCESS_32_BITS)) {
- for (top = m; m != 0; m = m->m_next) {
+ for (m = m0; m != NULL; m = m->m_next) {
if (m->m_len > 3)
outsl(BASE + EP_W1_TX_PIO_WR_1,
mtod(m, caddr_t), m->m_len / 4);
@@ -547,7 +542,7 @@
mtod(m, caddr_t) + (m->m_len & (~3)), m->m_len & 3);
}
} else {
- for (top = m; m != 0; m = m->m_next) {
+ for (m = m0; m != NULL; m = m->m_next) {
if (m->m_len > 1)
outsw(BASE + EP_W1_TX_PIO_WR_1,
mtod(m, caddr_t), m->m_len / 2);
@@ -562,11 +557,11 @@
splx(s);
- BPF_MTAP(ifp, top);
+ BPF_MTAP(ifp, m0);
ifp->if_timer = 2;
ifp->if_opackets++;
- m_freem(top);
+ m_freem(m0);
/*
* Is another packet coming in? We don't want to overflow the tiny RX
@@ -578,9 +573,8 @@
* we check if we have packets left, in that case we prepare to come
* back later
*/
- if (ifp->if_snd.ifq_head) {
+ if (ifp->if_snd.ifq_head)
outw(BASE + EP_COMMAND, SET_TX_AVAIL_THRESH | 8);
- }
return;
}
goto startagain;
==== //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#6 (text+ko) ====
@@ -29,7 +29,7 @@
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.63 2003/05/01 16:31:21 orion Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.64 2003/06/26 13:13:18 mdodd Exp $");
#define OLDPCM_IOCTL
@@ -774,10 +774,8 @@
if (maxfrags == 0)
maxfrags = CHN_2NDBUFMAXSIZE / fragsz;
- if (maxfrags < 2) {
- ret = EINVAL;
- break;
- }
+ if (maxfrags < 2)
+ maxfrags = 2;
if (maxfrags * fragsz > CHN_2NDBUFMAXSIZE)
maxfrags = CHN_2NDBUFMAXSIZE / fragsz;
==== //depot/projects/hammer/sys/kern/kern_clock.c#10 (text+ko) ====
@@ -39,9 +39,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.160 2003/06/15 00:31:23 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.161 2003/06/26 09:50:51 smkelly Exp $");
#include "opt_ntp.h"
+#include "opt_ddb.h"
+#include "opt_watchdog.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,6 +73,10 @@
#include <sys/gmon.h>
#endif
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
#ifdef DEVICE_POLLING
extern void hardclock_device_poll(void);
#endif /* DEVICE_POLLING */
@@ -84,6 +90,22 @@
SYSCTL_OPAQUE(_kern, OID_AUTO, cp_time, CTLFLAG_RD, &cp_time, sizeof(cp_time),
"LU", "CPU time statistics");
+#ifdef WATCHDOG
+static int sysctl_watchdog_reset(SYSCTL_HANDLER_ARGS);
+static void watchdog_fire(void);
+
+static int watchdog_enabled;
+static unsigned int watchdog_ticks;
+static int watchdog_timeout = 20;
+
+SYSCTL_NODE(_debug, OID_AUTO, watchdog, CTLFLAG_RW, 0, "System watchdog");
+SYSCTL_INT(_debug_watchdog, OID_AUTO, enabled, CTLFLAG_RW, &watchdog_enabled,
+ 0, "Enable the watchdog");
+SYSCTL_INT(_debug_watchdog, OID_AUTO, timeout, CTLFLAG_RW, &watchdog_timeout,
+ 0, "Timeout for watchdog checkins");
+
+#endif /* WATCHDOG */
+
/*
* Clock handling routines.
*
@@ -228,6 +250,12 @@
*/
if (need_softclock)
swi_sched(softclock_ih, 0);
+
+#ifdef WATCHDOG
+ if (watchdog_enabled > 0 &&
+ (int)(ticks - watchdog_ticks) >= (hz * watchdog_timeout))
+ watchdog_fire();
+#endif /* WATCHDOG */
}
/*
@@ -481,3 +509,57 @@
SYSCTL_PROC(_kern, KERN_CLOCKRATE, clockrate, CTLTYPE_STRUCT|CTLFLAG_RD,
0, 0, sysctl_kern_clockrate, "S,clockinfo",
"Rate and period of various kernel clocks");
+
+#ifdef WATCHDOG
+/*
+ * Reset the watchdog timer to ticks, thus preventing the watchdog
+ * from firing for another watchdog timeout period.
+ */
+static int
+sysctl_watchdog_reset(SYSCTL_HANDLER_ARGS)
+{
+ int ret;
+
+ ret = 0;
+ watchdog_ticks = ticks;
+ return sysctl_handle_int(oidp, &ret, 0, req);
+}
+
+SYSCTL_PROC(_debug_watchdog, OID_AUTO, reset, CTLFLAG_RW, 0, 0,
+ sysctl_watchdog_reset, "I", "Reset the watchdog");
+
+/*
+ * Handle a watchdog timeout by dumping interrupt information and
+ * then either dropping to DDB or panicing.
+ */
+static void
+watchdog_fire(void)
+{
+ int nintr;
+ u_int64_t inttotal;
+ u_long *curintr;
+ char *curname;
+
+ curintr = intrcnt;
+ curname = intrnames;
+ inttotal = 0;
+ nintr = eintrcnt - intrcnt;
+
+ printf("interrupt total\n");
+ while (--nintr >= 0) {
+ if (*curintr)
+ printf("%-12s %20lu\n", curname, *curintr);
+ curname += strlen(curname) + 1;
+ inttotal += *curintr++;
+ }
+ printf("Total %20llu\n", inttotal);
+
+#ifdef DDB
+ db_print_backtrace();
+ Debugger("watchdog timeout");
+#else /* !DDB */
+ panic("watchdog timeout");
+#endif /* DDB */
+}
+
+#endif /* WATCHDOG */
==== //depot/projects/hammer/sys/modules/Makefile#20 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.334 2003/06/24 13:35:46 iedowse Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.335 2003/06/26 08:06:31 ru Exp $
.if !defined(NOCRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
@@ -299,6 +299,7 @@
.endif
.if defined(ALL_MODULES)
+SUBDIR+=null
SUBDIR+=ufs
.endif
==== //depot/projects/hammer/sys/net80211/ieee80211_input.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.2 2003/06/25 17:42:36 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.3 2003/06/26 22:11:19 sam Exp $");
#include "opt_inet.h"
@@ -941,6 +941,8 @@
ni->ni_fhdwell = ic->ic_bss->ni_fhdwell;
ni->ni_fhindex = ic->ic_bss->ni_fhindex;
if (ni->ni_associd == 0) {
+ /* XXX handle rollover at 2007 */
+ /* XXX guarantee uniqueness */
ni->ni_associd = 0xc000 | ic->ic_bss->ni_associd++;
newassoc = 1;
} else
==== //depot/projects/hammer/sys/vm/vm_page.c#11 (text+ko) ====
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.252 2003/06/22 21:35:41 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.253 2003/06/26 15:44:03 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -719,7 +719,8 @@
while (TRUE) {
m = vm_pageq_find(PQ_CACHE, color & PQ_L2_MASK, FALSE);
if (m && ((m->flags & (PG_BUSY|PG_UNMANAGED)) || m->busy ||
- m->hold_count || m->wire_count)) {
+ m->hold_count || m->wire_count ||
+ !VM_OBJECT_TRYLOCK(m->object))) {
vm_page_deactivate(m);
continue;
}
@@ -765,6 +766,7 @@
vm_page_t
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list