Re: GENERIC_TINY build failure

[Ingo Feinerer <feinerer%logic.at@localhost>]

On Sun, Aug 26, 2018 at 05:28:45PM +0200, Martin Husemann wrote:
> This patch fixes it for me, but I am not sure it is the best way to deal
> with it.

I cannot comment on the "best way" but can confirm it fixes the build.

Thanks!

Best regards,
Ingo

> Index: efi.c
> ===================================================================
> RCS file: /cvsroot/src/sys/arch/x86/x86/efi.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 efi.c
> --- efi.c	19 May 2018 17:18:57 -0000	1.15
> +++ efi.c	26 Aug 2018 15:27:04 -0000
> @@ -40,7 +40,11 @@ __KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.15
>  #include <x86/efi.h>
>  
>  #include <dev/mm.h>
> +
> +#include "pci.h"	/* for NPCI */
> +#if NPCI > 0
>  #include <dev/pci/pcivar.h> /* for pci_mapreg_map_enable_decode */
> +#endif
>  
>  const struct uuid EFI_UUID_ACPI20 = EFI_TABLE_ACPI20;
>  const struct uuid EFI_UUID_ACPI10 = EFI_TABLE_ACPI10;
> @@ -408,7 +412,9 @@ efi_init(void)
>  		return;
>  	}
>  	bootmethod_efi = true;
> +#if NPCI > 0
>  	pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */
> +#endif
>  }
>  
>  bool
>