Date: Mon, 2 Oct 2017 11:01:25 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: "Alex V. Petrov" <alexvpetrov@gmail.com>, andrew@FreeBSD.org, lwhsu@FreeBSD.org, "freebsd-current@freebsd.org" <freebsd-current@freebsd.org> Subject: Re: Build error: 'isa/rtc.h' file not found Message-ID: <20171002080125.GR95911@kib.kiev.ua> In-Reply-To: <20171002094436.0fc6ab5b@thor.intern.walstatt.dynvpn.de> References: <dc4511a8-0ea1-4419-084c-b22482e76667@gmail.com> <20171002094436.0fc6ab5b@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Oct 02, 2017 at 09:44:36AM +0200, O. Hartmann wrote: > Am Mon, 2 Oct 2017 11:35:22 +0700 > "Alex V. Petrov" <alexvpetrov@gmail.com> schrieb: > > > revision 324186 > > In file included from /usr/obj/usr/src/tmp/usr/include/sys/efi.h:33: > > /usr/obj/usr/src/tmp/usr/include/machine/efi.h:35:10: fatal error: > > 'isa/rtc.h' file not found > > Me, too here. > I am only starting the build, but I believe that the following patch should give the fix. diff --git a/sys/amd64/include/efi.h b/sys/amd64/include/efi.h index 75d39592e28..eaea8d03276 100644 --- a/sys/amd64/include/efi.h +++ b/sys/amd64/include/efi.h @@ -32,8 +32,6 @@ #ifndef __AMD64_INCLUDE_EFI_H_ #define __AMD64_INCLUDE_EFI_H_ -#include <isa/rtc.h> - /* * 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 <isa/rtc.h> + #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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171002080125.GR95911>