From nobody Tue Jan 24 22:09:56 2023 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 4P1h3S563Xz3bdgC; Tue, 24 Jan 2023 22:09:56 +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 4P1h3S3xrPz4HWc; Tue, 24 Jan 2023 22:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598196; 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=QUM3HEU+1RAVPy8k3SNK5p9IINf5q80lpe8DdxvccB4=; b=o3gdaOG04qVy75YVFsanEVOlhAormonq76nS6GKaqLCZvYiCc3TvYaznGglL+iz+0xzalL /H2z7nZBA6y2vIn4CfaSUqbc/p+h2Udvkb1q9svfSEgxbNbL4QWuIOC8nb+URGZq9bK+ED SCfwgZOuQnfAG1DVB6/TF9bvwABOqgPlDQjxk/rKYDFPze6WpocW6Fz7V3zfjR0J8sNgAD clSA7IZ9U5ejLO7PzEHKnjEYMHHd4hiTZtsxe/2+ZYFs2Z0HlFrkPwDZSsAjl+0dpqQJNH HkB2EArWWdsySgKOA1vuO+Fi8TL6pXaEeXKgpvhslAis7G7kTPXA2Hf4GML26w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598196; 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=QUM3HEU+1RAVPy8k3SNK5p9IINf5q80lpe8DdxvccB4=; b=SOZYVDFr5B73aLRM0i+IONExD841bL/TYXlWvMutbcuvC8CJQXVvHn5q8PBuWlAZRDYJ6B 63QmNA5lN2y4+cQQcptXoRaajgT4loNQfN9687aH4o4T6lVW6nHWBOytAuOs8156Rh1cxg BWJ3/+Fh/hDdZ1ffkT2M527xgMgaH6sw9xsF7ciXL7BsrUgAijoEwptQg/jgWcvAISyYI1 JcqRh6Rqip81pjSl5Llye7C38Run8iQ9a4qsrmfUL9lMnXGqoOixRefapyHkRy1BhO2ZVf nsEZXgV2ZaiBE8dWVhVqzQfipIsLzTYpOjBZTJlOs3i3ACRmiHK2Hta2bfEzHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598196; a=rsa-sha256; cv=none; b=Dd2Jw3dzT5Ut1FycOJf5iZG+e7DFsxDvRT57YzcPoINp/sJqKmOuJb2fay87qM3ziQ7ZRr TTyn0nqqLmpklqWljBu6DQizp9EVCGM22Jq4S6m2IxeQUGj+iN7BBcJhRR96wn9+1UL/Of JP/0hjQR2leJTRjCdZLAY8BqlPQcKCC9XSntBVBBAjWb6KzbwucAVC2YIZs3R3Ym6Lourw gXUgzKq8rdeDnRqwYJY2r9Gwurxa565nzp+O7cMeQoaFyuUYpdsq2cacFDSH4JPxP2w6N+ 9ckQCc5UbK6hQNfYawX+oy14p6CDlAbuJP+uVQyjXzwrGPavEJYLV5cEL77urQ== 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 4P1h3S33SfzQNS; Tue, 24 Jan 2023 22:09:56 +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 30OM9uie070978; Tue, 24 Jan 2023 22:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OM9uBS070977; Tue, 24 Jan 2023 22:09:56 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:09:56 GMT Message-Id: <202301242209.30OM9uBS070977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f67328181236 - stable/13 - loader.efi: remove extra extern ST 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f67328181236767aaade8746e4224d671434a22c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f67328181236767aaade8746e4224d671434a22c commit f67328181236767aaade8746e4224d671434a22c Author: Warner Losh AuthorDate: 2021-09-30 02:07:13 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:17 +0000 loader.efi: remove extra extern ST The definition for 'ST' is in efilib.h, so we don't need extern ST here. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D32225 (cherry picked from commit 8ea95b2fbab8eb891c4191c1879199685951b1f6) --- stand/efi/loader/bootinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 046d56a2b4fb..da9577803b12 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs); -extern EFI_SYSTEM_TABLE *ST; +int boot_services_gone; static int bi_getboothowto(char *kargs)