From owner-svn-src-stable@FreeBSD.ORG Tue Sep 27 15:08:59 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8924F1065673; Tue, 27 Sep 2011 15:08:59 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 78C348FC0A; Tue, 27 Sep 2011 15:08:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8RF8xZD028973; Tue, 27 Sep 2011 15:08:59 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8RF8xdt028971; Tue, 27 Sep 2011 15:08:59 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201109271508.p8RF8xdt028971@svn.freebsd.org> From: Alexander Motin Date: Tue, 27 Sep 2011 15:08:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225799 - stable/9/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Sep 2011 15:08:59 -0000 Author: mav Date: Tue Sep 27 15:08:59 2011 New Revision: 225799 URL: http://svn.freebsd.org/changeset/base/225799 Log: MFC r225788: Fix interrupt counters dumping on SW_WATCHDOG fire. Approved by: re (kib) Modified: stable/9/sys/kern/kern_clock.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/kern/kern_clock.c ============================================================================== --- stable/9/sys/kern/kern_clock.c Tue Sep 27 14:28:07 2011 (r225798) +++ stable/9/sys/kern/kern_clock.c Tue Sep 27 15:08:59 2011 (r225799) @@ -842,7 +842,7 @@ watchdog_fire(void) curintr = intrcnt; curname = intrnames; inttotal = 0; - nintr = sintrcnt; + nintr = sintrcnt / sizeof(u_long); printf("interrupt total\n"); while (--nintr >= 0) {