From nobody Sat Jan 27 18:49:07 2024 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 4TMk9w04c2z58jq6; Sat, 27 Jan 2024 18:49:08 +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 4TMk9v6cdKz4lMW; Sat, 27 Jan 2024 18:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; 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=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=sfbr1I40WgThvlOsTBVL0wCoXjcK2onbEiZlkGEXXQQRin3PYZDQbGzGZ1Y5lzctc9QJkC fXiBzk8Aoy566ct0Pmyhxey030FG3hs8DMePi0jzJdWeqJHaL1aWfsoPpT+PlsIXIQDWEB UBWnbTxFF29/4lS6AcwRs2h8uysGQex+exvMCd3USgUVg9DVa1B7xnrvA7fSFbgclXWyyV iadTZDx6rcY+5JXt8SQA0cLX3APfwoNy3V4/6nLkpo8B1M4BIL/xIjcmNP9TMla815NyEO CLknkBitoD2s8RduzeJ/fxxo+1gPydXzuDI5d3t/c6TGOwjdUJX33gDnQ1PS2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; 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=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=IEo/BeBJwDy7vVSAA+Y9Bu6VXqE2ypKyMSrny+nbF/MyKCxFse5IvunQeLfcg63srqq8OQ M+qsu9wndvF6zvX+RZIo+Yyq1EsdxS6K/M4y3D1UTI5cmoF90mqLi/RKGZi3+O5yDrynOM GWC0kOm2QuMBGbgg+8qFpV5pRZBNmZkyKVCQ5ZBrfUUNrMDCMCkRXGu9ynKTnw8wfP7894 GasXkLOYnTwS70EcLVemjqP76X0Wlz0gh5hdJmoFOfqiKEHxh6kWjDM1yAdROd1ueJsT4j zY6l4og/DB3Sa883kx9mIWUl7v4/8hypQsJgGNV8TP6TdsTC5bOfkWnD4H9vsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381347; a=rsa-sha256; cv=none; b=d4CYk3AH92vXFc9MOl244It1aD/uLjsKQeh9b/Q+oqW0/sa6hgcOoznsv1/xR55ZnYs41y P09+dFYt4fUMUtn2p5ltPmvmOGqbARY1BTLjsQ+HnHt5uZ3tbQlegSPY+JFhv93w2iOIXt JoctPellJvVQ6IgI6dXjA043gEXXoPgqr+IcZBL/wAoZGUrF5B/qEnyB6UvRSCB0jgGU6g kogB/EayY10JepCUsthjZv7V9iFNXyebn08sgu1zagUJDONnbAtYPTMn6yT09+bpvR4PpY SwOuXzPtHwcbiSHgFPUOTEfxiQXwkN5Q5tIXlSMUC+o2DouJ83Ji0NE3sqJCgg== 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 4TMk9v5gKjzcMc; Sat, 27 Jan 2024 18:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40RIn7Er073987; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIn7Na073984; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:49:07 GMT Message-Id: <202401271849.40RIn7Na073984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 00a82bd964b6 - stable/13 - hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00a82bd964b68ad20f47b25f9419af14ff159f64 Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=00a82bd964b68ad20f47b25f9419af14ff159f64 commit 00a82bd964b68ad20f47b25f9419af14ff159f64 Author: Vladimir Kondratyev AuthorDate: 2021-04-22 22:13:25 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-01-27 18:46:46 +0000 hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. Reported by: olivier PR: 268653 (cherry picked from commit 55eb41bb1fb69429330ea415fb463735ae08da64) --- sys/dev/hyperv/input/hv_kbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/hyperv/input/hv_kbd.c b/sys/dev/hyperv/input/hv_kbd.c index 82d661faedb9..3f8fe3c30154 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -267,9 +267,8 @@ hvkbd_read_char_locked(keyboard_t *kbd, int wait) uint32_t action; keystroke ks; hv_kbd_sc *sc = kbd->kb_data; -#ifdef EVDEV_SUPPORT int keycode; -#endif + HVKBD_LOCK_ASSERT(); if (!KBD_IS_ACTIVE(kbd) || !hv_kbd_prod_is_ready(sc))