From owner-p4-projects@FreeBSD.ORG Thu Aug 21 19:24:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0863106567A; Thu, 21 Aug 2008 19:24:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62DC1106566C for ; Thu, 21 Aug 2008 19:24:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E33C8FC29 for ; Thu, 21 Aug 2008 19:24:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7LJOkGS092885 for ; Thu, 21 Aug 2008 19:24:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7LJOkbH092883 for perforce@freebsd.org; Thu, 21 Aug 2008 19:24:46 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 21 Aug 2008 19:24:46 GMT Message-Id: <200808211924.m7LJOkbH092883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Aug 2008 19:24:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=148031 Change 148031 by ed@ed_flippo on 2008/08/21 19:24:17 IFC again. It seems I deleted the acpi_asus.4 manpage by accident. Affected files ... .. //depot/projects/mpsafetty/share/man/man4/acpi_asus.4#3 branch .. //depot/projects/mpsafetty/share/man/man4/ichwd.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/ichwd.4#2 delete .. //depot/projects/mpsafetty/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_acct.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_output.c#3 integrate .. //depot/projects/mpsafetty/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/share/man/man4/ichwd.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ichwd.4,v 1.1 2007/08/23 20:05:09 des Exp $ +.\" $FreeBSD: src/share/man/man4/ichwd.4,v 1.2 2008/08/21 17:53:13 rpaulo Exp $ .\" -.Dd August 23, 2007 +.Dd August 20, 2008 .Dt ICHWD 4 .Os .Sh NAME @@ -50,12 +50,29 @@ .Nm driver provides .Xr watchdog 4 -support for the watchdog interrupt timer present in -the Intel ICH motherboard chipsets. +support for the watchdog interrupt timer present on +all Intel ICH motherboard chipsets. +.Pp +The ICH WDT counts down in ticks of approximately 0.6 seconds; the +exact value depends on hardware quality and environmental factors. +Supported watchdog intervals range from 2 to 63 ticks. +.Pp +Note that on some ICH-based systems, the WDT may be present but +disabled, either in hardware or by the BIOS. +The +.Nm +driver attempts to detect this condition and will refuse to attach if +it believes the WDT is disabled. .Sh SEE ALSO .Xr watchdog 4 , .Xr watchdog 8 , -.Xr watchdogd 8 +.Xr watchdogd 8, +.Xr watchdog 9 +.Rs +.%T Using the Intel ICH Family Watchdog Timer (WDT) +.%R Intel Application Note AP-725 +.%O Document Number 292273-001 +.Re .Sh HISTORY The .Nm @@ -65,8 +82,9 @@ .An -nosplit The .Nm -driver was originally written by -.An Wm. Daryl Hawkins -of Texas A&M University. +driver was written by +.An Wm. Daryl Hawkins Aq dhawkins@tamu.edu +of Texas A&M University and +.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . This manual page was written by .An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . ==== //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.190 2008/08/21 00:40:55 rpaulo Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.191 2008/08/21 17:53:13 rpaulo Exp $ MAN= aic.4 \ alpm.4 \ @@ -16,7 +16,6 @@ ex.4 \ fe.4 \ glxsb.4 \ - ichwd.4 \ ie.4 \ longrun.4 \ mcd.4 \ ==== //depot/projects/mpsafetty/sys/dev/mxge/if_mxge_var.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/mxge/if_mxge_var.h,v 1.20 2008/02/14 16:24:14 gallatin Exp $ +$FreeBSD: src/sys/dev/mxge/if_mxge_var.h,v 1.21 2008/08/21 16:35:34 gallatin Exp $ ***************************************************************************/ @@ -39,7 +39,8 @@ #define MXGE_EEPROM_STRINGS_SIZE 256 #define MXGE_MAX_SEND_DESC 128 -#if (__FreeBSD_version < 800005) +#if ((__FreeBSD_version > 800000 && __FreeBSD_version < 800005) \ + || __FreeBSD_version < 700111) #define MXGE_VIRT_JUMBOS 1 #else #define MXGE_VIRT_JUMBOS 0 ==== //depot/projects/mpsafetty/sys/kern/kern_acct.c#4 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.99 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.100 2008/08/21 15:02:17 ed Exp $"); #include "opt_mac.h" ==== //depot/projects/mpsafetty/sys/netinet/ip_output.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.284 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.285 2008/08/21 17:24:49 rwatson Exp $"); #include "opt_ipfw.h" #include "opt_ipsec.h" @@ -1167,17 +1167,6 @@ ip->ip_off = htons(ip->ip_off); ip->ip_sum = 0; ip->ip_sum = in_cksum(copym, hlen); - /* - * NB: - * It's not clear whether there are any lingering - * reentrancy problems in other areas which might - * be exposed by using ip_input directly (in - * particular, everything which modifies the packet - * in-place). Yet another option is using the - * protosw directly to deliver the looped back - * packet. For the moment, we'll err on the side - * of safety by using if_simloop(). - */ #if 1 /* XXX */ if (dst->sin_family != AF_INET) { printf("ip_mloopback: bad address family %d\n", @@ -1185,12 +1174,6 @@ dst->sin_family = AF_INET; } #endif - -#ifdef notdef - copym->m_pkthdr.rcvif = ifp; - ip_input(copym); -#else if_simloop(ifp, copym, dst->sin_family, 0); -#endif } } ==== //depot/projects/mpsafetty/tools/tools/crypto/cryptotest.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/crypto/cryptotest.c,v 1.10 2008/02/05 08:07:19 matteo Exp $ + * $FreeBSD: src/tools/tools/crypto/cryptotest.c,v 1.11 2008/08/21 16:49:57 raj Exp $ */ /* @@ -250,7 +250,7 @@ char *cleartext, *ciphertext, *originaltext; struct session2_op sop; struct crypt_op cop; - char iv[8]; + char iv[EALG_MAX_BLOCK_LEN]; bzero(&sop, sizeof(sop)); if (!alg->ishash) { ==== //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/fetch/fetch.c,v 1.78 2006/11/10 22:05:41 des Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/fetch/fetch.c,v 1.79 2008/08/21 14:12:34 obrien Exp $"); #include #include @@ -364,7 +364,7 @@ } /* FTP specific flags */ - if (strcmp(url->scheme, "ftp") == 0) { + if (strcmp(url->scheme, SCHEME_FTP) == 0) { if (p_flag) strcat(flags, "p"); if (d_flag) @@ -375,7 +375,7 @@ } /* HTTP specific flags */ - if (strcmp(url->scheme, "http") == 0) { + if (strcmp(url->scheme, SCHEME_HTTP) == 0) { if (d_flag) strcat(flags, "d"); if (A_flag)