From nobody Sun Jan 29 12:38:18 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 4P4W7Z5F7Nz3cQ10; Sun, 29 Jan 2023 12:38:18 +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 4P4W7Z4lzNz3r6k; Sun, 29 Jan 2023 12:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674995898; 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=2wo+z95HIaxcQ9+I7x+ouThVY5/CRmo79B1oVULBh98=; b=ekc6YwaLCkGPZ01YxX5FV3BlMY00FbE5AJthCtQdJCgZT3U5iCiyUHh4YxRKtiDjvdgSMb xGCK/04yb2FGOr1rAyJKS9mSP1AFCVwf1QGYNdXR2c8cpwrpV0j7123alUGuQVoCUkhozH IMFN45S64/7ncK8vLzi4DKVoMoXxyFPJTWrcXsLXPWx6er7c2OfPRDc9ucJCcXGdRXspJK lkm7IqhvcxRfBLZGdZCbD3lgKeusUThS+cQPO1skRw8LwSo4G915kaFFpp9dhQu9K9o08x FmiqCopoROKtnWQNEluLyG/gO8eqxaA5QUBx6vlOI6m/q+gZD/wM3DQLsj8IvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674995898; 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=2wo+z95HIaxcQ9+I7x+ouThVY5/CRmo79B1oVULBh98=; b=s9XOFzdtwb8aIb55yoIkJ41w+DHiG7uLvjlVM+W/NVAaZsnqMiIMotZqDEW2Zk/RHJXOZ0 wt7yOolBCWMcquN1z2crN7olGCvj9mK3Bj/t5JwVKjDnFCorPd4zM46D1wfTmQuprXM3bj +2kjkjadVCFlUYhG+R1uUqfpA3AraNZWQfsRjdkwsVOdkVTkpJgO7qgVSUjZjXD/EWHkiL eV/L3VzYSod7b4imRQhdi6CPkSBfMdtdgiQHzsOjOSEuD3BD/FqxONIYfAFkQCNK1G6HAC bgMjTYQalWIBhkZFqIv9bmVasSZExdHjmz1huiOwCG5pEJ5vu6li4D+R+chjLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674995898; a=rsa-sha256; cv=none; b=lsYJg+rBcbbCA3c8IOT81nmcP42RYBAmK3GuDQ3XgpsBB3qCLV7WgPzck1UO0Dq6CVxVqI sHgpEwAehy5c4QWkk/cDw8bxduQPk4LH72riSHsgWfAWWaA25qecmn4GZ6WVgfAjNnSlnc 8jQtzG5Ss9O61ISUltqB8+q4yKtubIlmLPQUtYQJbn/qjB9O5VaBzWSlPiC2ty5T7xpvv7 M+vf6vnRajY1nVOqw+d+vbYQNOzx+8hEaOfWK3LzxJeLnV8M9pQkzxDCI13wZm1Yq3Tfl0 cYtEJ6LcKXbfVLyN6Y/cay0ctmI38M7a1wO0cTv71sSv2dpZR8+xOc2IBPwCXg== 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 4P4W7Z3pVczTFF; Sun, 29 Jan 2023 12:38:18 +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 30TCcIGM050904; Sun, 29 Jan 2023 12:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TCcIvc050903; Sun, 29 Jan 2023 12:38:18 GMT (envelope-from git) Date: Sun, 29 Jan 2023 12:38:18 GMT Message-Id: <202301291238.30TCcIvc050903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6fdf04a2be9b - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6fdf04a2be9b5b509c5b3d927e087122189ad1fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6fdf04a2be9b5b509c5b3d927e087122189ad1fb commit 6fdf04a2be9b5b509c5b3d927e087122189ad1fb Author: Dmitry Chagin AuthorDate: 2023-01-29 12:33:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-01-29 12:33:16 +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 --- 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 da5c7f52f955..44f3103ff2be 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -980,10 +980,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;