From nobody Mon Feb 6 19:07:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9bPB58B4z3n4HY; Mon, 6 Feb 2023 19:07:42 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9bPB4Hc2z3Pnl; Mon, 6 Feb 2023 19:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5NBFz7dGgPzWSqX7de0jFpkmU66x+nNg988F9lsO94=; b=gJibCVtq3lSjYwOTQktY0mHtQGL3qx+/xArc0SHRxHWMvA9NZRXbraHoQk8k/BQOsy2pr3 EqkD9UJ02pMvsz8P0dUnclmWIqVAVCglSMW/H4cf0VrH/gDKl4V2pJJTACokuSch47odnk 8Pv8MGWlGsmVccd0HBSDne7bsFHVvNLUvUgqjU8wCIZaiMlpdj4VV+4es6hzHNx4X32UFT UBJMHQXMCNLGMGqWeHXc/6oLNqpkiBbBMqm6x942H6tbm1GpYSapAwYj/YxdUx76Cqch7U IOYHOIfYyyaGxuZGlpvJ2MhmD/JDqujBAVogjUKfmC5vDpiEQeut4cme9e9ZbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5NBFz7dGgPzWSqX7de0jFpkmU66x+nNg988F9lsO94=; b=UYavQksJ2Ko96WGkZ64EeMwB0l6YR3SAvWe64HsAH5PimDY703x3gU7066BUmoemgGPzeK spHm7s7mH6lTYi5UjzOPLgUeC9NroQAjrF/lj36J9Rnh0/FcMLXd/GsGi5h5b7M5Qu4Rc2 +DQoQcWT2ARAXEn7P4+b3n/FX+HX55W0CLjNQNe7Wkl4NQxCXuh89+284/CyNCDuHbmRSk sa8lAQkAc870JOCYDxHZS0pQMOAnDDwhiyXYccgATdz2bLhjTd5JB41avRU46rpVLtYyi8 UQgSvc7pLEPWHcgkMTk6M9W9015NEHwgV3WNTu8KuDwnbmVa+68RGNDfA9Y+mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675710462; a=rsa-sha256; cv=none; b=t91CqU/WMNAbIJJGfmFoG0UDFmSJ6B08NjY3vN5fRYJiRIzQkefumO497cXgjbeCkGDhb0 1S5fsscQC97UII5WdeKKu11VNTWVRecUTR29qG8vUio1oIfWF23HC7YtyrF9WKyEsWVd0P hc52+x+k8rHbeoqib89HuuTfopO/URmVZhKqeP7X7h/AJrJWNqRM8ADpHypqIq5KjohJXx o7do5rN3sCTqxje8po1TwrTLitNofz6Z+EFEmY+Kf9KJhM83iJDUdODxq/FLmdW5ioJ0dH wvVFIzztWkhvAneEuYLPctc1XTLyFUH/2uIGJjCelzExGUR538ONnpo9x6vV5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9bPB3JTfzm2s; Mon, 6 Feb 2023 19:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316J7gpf076833; Mon, 6 Feb 2023 19:07:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316J7gR0076832; Mon, 6 Feb 2023 19:07:42 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:07:42 GMT Message-Id: <202302061907.316J7gR0076832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e600dd820db3 - stable/13 - smp: Drop confusing braces and return statement as panic() is never returns. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e600dd820db343e87bb858e03988c31eb7e44b5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e600dd820db343e87bb858e03988c31eb7e44b5e commit e600dd820db343e87bb858e03988c31eb7e44b5e Author: Dmitry Chagin AuthorDate: 2023-01-29 12:33:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-06 19:06:30 +0000 smp: Drop confusing braces and return statement as panic() is never returns. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D38235 MFC after: 1 week (cherry picked from commit 6fdf04a2be9b5b509c5b3d927e087122189ad1fb) --- sys/x86/x86/mp_x86.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index a7aa508f7699..5ced8eb50479 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -983,10 +983,9 @@ void cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > max_apic_id) { + if (apic_id > max_apic_id) panic("SMP: APIC ID %d too high", apic_id); - return; - } + KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %u added twice", apic_id)); cpu_info[apic_id].cpu_present = 1;