From owner-svn-src-stable@freebsd.org Fri Mar 8 01:04:20 2019 Return-Path: Delivered-To: svn-src-stable@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 4815A152D4DB; Fri, 8 Mar 2019 01:04:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D178283A0F; Fri, 8 Mar 2019 01:04:19 +0000 (UTC) (envelope-from jhb@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 C0DE923DF5; Fri, 8 Mar 2019 01:04:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2814JnL097141; Fri, 8 Mar 2019 01:04:19 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2814JQQ097139; Fri, 8 Mar 2019 01:04:19 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201903080104.x2814JQQ097139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 8 Mar 2019 01:04:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r344912 - in stable: 11/sys/x86/x86 11/sys/x86/xen 12/sys/x86/x86 12/sys/x86/xen X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/x86/x86 11/sys/x86/xen 12/sys/x86/x86 12/sys/x86/xen X-SVN-Commit-Revision: 344912 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D178283A0F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 08 Mar 2019 01:04:20 -0000 Author: jhb Date: Fri Mar 8 01:04:19 2019 New Revision: 344912 URL: https://svnweb.freebsd.org/changeset/base/344912 Log: MFC 342658: Correct variable name in two panic messages: num_msi_irq -> num_msi_irqs. Modified: stable/12/sys/x86/x86/msi.c stable/12/sys/x86/xen/xen_msi.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/x86/x86/msi.c stable/11/sys/x86/xen/xen_msi.c Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/x86/x86/msi.c ============================================================================== --- stable/12/sys/x86/x86/msi.c Fri Mar 8 00:56:41 2019 (r344911) +++ stable/12/sys/x86/x86/msi.c Fri Mar 8 01:04:19 2019 (r344912) @@ -341,7 +341,7 @@ msi_init(void) first_msi_irq = max(MINIMUM_MSI_INT, num_io_irqs); if (num_msi_irqs > UINT_MAX - first_msi_irq) - panic("num_msi_irq too high"); + panic("num_msi_irqs too high"); num_io_irqs = first_msi_irq + num_msi_irqs; msi_enabled = 1; Modified: stable/12/sys/x86/xen/xen_msi.c ============================================================================== --- stable/12/sys/x86/xen/xen_msi.c Fri Mar 8 00:56:41 2019 (r344911) +++ stable/12/sys/x86/xen/xen_msi.c Fri Mar 8 01:04:19 2019 (r344912) @@ -59,7 +59,7 @@ xen_msi_init(void) MPASS(num_io_irqs > 0); first_msi_irq = min(MINIMUM_MSI_INT, num_io_irqs); if (num_msi_irqs > UINT_MAX - first_msi_irq) - panic("num_msi_irq too high"); + panic("num_msi_irqs too high"); num_io_irqs = first_msi_irq + num_msi_irqs; mtx_init(&msi_lock, "msi", NULL, MTX_DEF);