From nobody Tue Aug 2 20:28:10 2022 X-Original-To: dev-commits-src-branches@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 4Ly64q1ql3z4YBPm; Tue, 2 Aug 2022 20:28:11 +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 4Ly64q1LSzz4Lm2; Tue, 2 Aug 2022 20:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659472091; 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=ll1HvPGHnpyfcSXYm0kgHspw3ReOywwIHbXEfuz0vxE=; b=X62PxeqeBJIqI7QUAu7Tn+jsVWj9sSRzgNbYvbaIdcW9AFP07doRmfpahOE4TzQgQCJ8Ma cuCQBndzDdFMBPOiKZnfmZAMiKgjBPiYhyJ4cWxAcNfUu5Otq1tGEA//ebmBNkPRAHURev HkgzVYxX5Gvg7SIA/HP1jgj5VUWAUNkJVPYPYxv1tyHm/IvlFHoZgemAHvkjX6iWj5ug9k THu0VJx78E+MJwPubFNPH9aABDkjpGvUXYXR0ZQwuno3/klGNqK+GA6U9xJGnP7chFBcUb 19gjFjPka47vsUSTU2giinWc1mXwYVhBXn/ST7gW9nvKnn+75JdycwR2+H4IuQ== 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 4Ly64q0BYNzQhn; Tue, 2 Aug 2022 20:28:11 +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 272KSAFp078498; Tue, 2 Aug 2022 20:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272KSAcP078497; Tue, 2 Aug 2022 20:28:10 GMT (envelope-from git) Date: Tue, 2 Aug 2022 20:28:10 GMT Message-Id: <202208022028.272KSAcP078497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 088920ccc694 - stable/13 - ule: unbreak UP builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 088920ccc6946fc39bf396bf59ed0871d0e9c1a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659472091; 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=ll1HvPGHnpyfcSXYm0kgHspw3ReOywwIHbXEfuz0vxE=; b=mwRuC4RyaSnZg7HBpAXhc7PB7o8I9jC4y3piKT1BkHYtNHB4sOBaPNhZjr3Lb+tWfWvcrz TCkmy7HYH2zFHyf9nUIhgI9zZOgbrSs9Jk0jZDc3SeWZvz70c8udPB6/ObVISU0I/vwSa6 kzKyWrXOJLTaCME2OguMZ4agGs2L5Wd+h06+1JnzXgficdj83qe/sBTeFAz8xR2v76Kqn/ HOrb51QUYbk7V1k6WSM9NFqqIyyK0BAg80d2APdrkWfVwOOZhJ8SJq7jdsDMTJKI5gC4Qd vlp/UckyLsH2nQKCQIUlAQs1FO6WsLvVc1S81QPP5mpKp7qTsPpLEhhYfi5Mxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659472091; a=rsa-sha256; cv=none; b=WhdJcZoTBtwVBWd/9S2/n//YdDX9snNmR04g/Cv1sHzuuPNS5/DNq6DlhCUorrm1QMQ8OF ZS8Dg7xB3FBswGW7LzH2C2HGqX4Q67skSCNZrLKrmYtIvf6zBc5ex7XCdyeAuxfbxnP8gn 6U6kYHspyElWGrH6do/etI7ZVzMSiF9fyKNjUz9k2OoCwbWZzw2emirTOglK09O3z/a39O sQiC9dlO6sI8fXYItSJGfSS/8GvXTRqkXEws4Y/qUneXRqUcBAR6LdDXO+o5m4OC52bGhc mUVkB3hypRf9YoY1xaQyiIaB9aFW6eguiT5drz7KkRmSyYLHopDTp234LaK1Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=088920ccc6946fc39bf396bf59ed0871d0e9c1a9 commit 088920ccc6946fc39bf396bf59ed0871d0e9c1a9 Author: Mateusz Guzik AuthorDate: 2022-07-16 12:45:09 +0000 Commit: Mark Johnston CommitDate: 2022-08-02 20:27:24 +0000 ule: unbreak UP builds Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6eeba7dbd63c30704a713a2a8cdc5233600ef63b) --- sys/kern/sched_ule.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 0a830da7e2d5..4cde748ea9b7 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2128,7 +2128,9 @@ static struct mtx * sched_switch_migrate(struct tdq *tdq, struct thread *td, int flags) { struct tdq *tdn; +#ifdef SMP int lowpri; +#endif KASSERT(THREAD_CAN_MIGRATE(td) || (td_get_sched(td)->ts_flags & TSF_BOUND) != 0,