From owner-freebsd-current@freebsd.org Mon Oct 2 08:01:30 2017 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C41C8E3929D for ; Mon, 2 Oct 2017 08:01:30 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3FFE1836BE; Mon, 2 Oct 2017 08:01:30 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v9281Ph9083508 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 2 Oct 2017 11:01:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v9281Ph9083508 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v9281PjF083507; Mon, 2 Oct 2017 11:01:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 2 Oct 2017 11:01:25 +0300 From: Konstantin Belousov To: "O. Hartmann" Cc: "Alex V. Petrov" , andrew@FreeBSD.org, lwhsu@FreeBSD.org, "freebsd-current@freebsd.org" Subject: Re: Build error: 'isa/rtc.h' file not found Message-ID: <20171002080125.GR95911@kib.kiev.ua> References: <20171002094436.0fc6ab5b@thor.intern.walstatt.dynvpn.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171002094436.0fc6ab5b@thor.intern.walstatt.dynvpn.de> User-Agent: Mutt/1.9.1 (2017-09-22) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Oct 2017 08:01:30 -0000 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" 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 - /* * 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_ */