From owner-svn-src-all@freebsd.org  Sun May 27 23:52:42 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83188EF10BB;
 Sun, 27 May 2018 23:52:42 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EE790739F6;
 Sun, 27 May 2018 23:52:41 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFCB02570D;
 Sun, 27 May 2018 23:52:41 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4RNqfpg095330;
 Sun, 27 May 2018 23:52:41 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4RNqfSO095329;
 Sun, 27 May 2018 23:52:41 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201805272352.w4RNqfSO095329@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sun, 27 May 2018 23:52:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r334263 - stable/11/sys/cam
X-SVN-Group: stable-11
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: stable/11/sys/cam
X-SVN-Commit-Revision: 334263
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 May 2018 23:52:42 -0000

Author: sbruno
Date: Sun May 27 23:52:41 2018
New Revision: 334263
URL: https://svnweb.freebsd.org/changeset/base/334263

Log:
  r334229 mismerged and broke kernel options CAM_IOSCHED_DYNAMIC.
  
  Fix that on this holiday weekend.
  
  Approved by:	re (implicit)

Modified:
  stable/11/sys/cam/cam_iosched.c

Modified: stable/11/sys/cam/cam_iosched.c
==============================================================================
--- stable/11/sys/cam/cam_iosched.c	Sun May 27 22:32:45 2018	(r334262)
+++ stable/11/sys/cam/cam_iosched.c	Sun May 27 23:52:41 2018	(r334263)
@@ -510,7 +510,7 @@ cam_iosched_ticker(void *arg)
 	struct cam_iosched_softc *isc = arg;
 	sbintime_t now, delta;
 
-	callout_reset(&isc->ticker, hz / isc->quanta1, cam_iosched_ticker, isc);
+	callout_reset(&isc->ticker, hz / isc->quanta, cam_iosched_ticker, isc);
 
 	now = sbinuptime();
 	delta = now - isc->last_time;