From owner-svn-src-stable@FreeBSD.ORG  Thu Nov 15 19:27:12 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 31C2766A;
 Thu, 15 Nov 2012 19:27:12 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 15E978FC13;
 Thu, 15 Nov 2012 19:27:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFJRBp9043834;
 Thu, 15 Nov 2012 19:27:11 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFJRBYL043833;
 Thu, 15 Nov 2012 19:27:11 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201211151927.qAFJRBYL043833@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Thu, 15 Nov 2012 19:27:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243097 - stable/9/usr.bin/ktrdump
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 19:27:12 -0000

Author: np
Date: Thu Nov 15 19:27:11 2012
New Revision: 243097
URL: http://svnweb.freebsd.org/changeset/base/243097

Log:
  MFC r242378:
  Catch up with r238925.  ktr_entries may not be a power of 2.

Modified:
  stable/9/usr.bin/ktrdump/ktrdump.c
Directory Properties:
  stable/9/usr.bin/ktrdump/   (props changed)

Modified: stable/9/usr.bin/ktrdump/ktrdump.c
==============================================================================
--- stable/9/usr.bin/ktrdump/ktrdump.c	Thu Nov 15 19:23:39 2012	(r243096)
+++ stable/9/usr.bin/ktrdump/ktrdump.c	Thu Nov 15 19:27:11 2012	(r243097)
@@ -218,7 +218,7 @@ main(int ac, char **av)
 	 * Now tear through the trace buffer.
 	 */
 	if (!iflag)
-		i = (index - 1) & (entries - 1);
+		i = (index - 1) % entries;
 	tlast = -1;
 	for (;;) {
 		if (buf[i].ktr_desc == NULL)
@@ -286,7 +286,7 @@ next:			if ((c = *p++) == '\0')
 		if (!iflag) {
 			if (i == index)
 				break;
-			i = (i - 1) & (entries - 1);
+			i = (i - 1) % entries;
 		} else {
 			if (++i == entries)
 				break;