From owner-dev-commits-src-all@freebsd.org Thu Apr 22 22:14:23 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DADB36210C2; Thu, 22 Apr 2021 22:14:23 +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 4FRBXv5rwsz4rRh; Thu, 22 Apr 2021 22:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BBBBA21F06; Thu, 22 Apr 2021 22:14:23 +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 13MMENNf078123; Thu, 22 Apr 2021 22:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MMENsI078122; Thu, 22 Apr 2021 22:14:23 GMT (envelope-from git) Date: Thu, 22 Apr 2021 22:14:23 GMT Message-Id: <202104222214.13MMENsI078122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 55eb41bb1fb6 - main - hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. 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/main X-Git-Reftype: branch X-Git-Commit: 55eb41bb1fb69429330ea415fb463735ae08da64 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 22:14:23 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=55eb41bb1fb69429330ea415fb463735ae08da64 commit 55eb41bb1fb69429330ea415fb463735ae08da64 Author: Vladimir Kondratyev AuthorDate: 2021-04-22 22:13:25 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-04-22 22:13:25 +0000 hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. Reported by: olivier MFC with: e4643aa4c4ff --- 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 52ce621b2a89..53aacda7fbcb 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -269,9 +269,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))