From owner-svn-src-stable-11@freebsd.org Thu Mar 15 20:40:28 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CA36F51A5B; Thu, 15 Mar 2018 20:40:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C06D0773D9; Thu, 15 Mar 2018 20:40:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB4571AD10; Thu, 15 Mar 2018 20:40:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FKeR7g000647; Thu, 15 Mar 2018 20:40:27 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FKeR82000646; Thu, 15 Mar 2018 20:40:27 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803152040.w2FKeR82000646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Mar 2018 20:40:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331026 - stable/11/sys/amd64/include X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/amd64/include X-SVN-Commit-Revision: 331026 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 20:40:28 -0000 Author: kevans Date: Thu Mar 15 20:40:27 2018 New Revision: 331026 URL: https://svnweb.freebsd.org/changeset/base/331026 Log: MFC r324191: Hide kernel stuff from userspace. Modified: stable/11/sys/amd64/include/efi.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/include/efi.h ============================================================================== --- stable/11/sys/amd64/include/efi.h Thu Mar 15 20:29:48 2018 (r331025) +++ stable/11/sys/amd64/include/efi.h Thu Mar 15 20:40:27 2018 (r331026) @@ -32,8 +32,6 @@ #ifndef __AMD64_INCLUDE_EFI_H_ #define __AMD64_INCLUDE_EFI_H_ -#include - /* * XXX: from gcc 6.2 manual: * Note, the ms_abi attribute for Microsoft Windows 64-bit targets @@ -47,8 +45,12 @@ #define EFIABI_ATTR __attribute__((ms_abi)) #endif +#ifdef _KERNEL +#include + #define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock); #define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock); #define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED); +#endif #endif /* __AMD64_INCLUDE_EFI_H_ */