diff options
| author |   kn <kn@openbsd.org> | 2018-11-05 15:13:56 +0000 |
|---|---|---|
| committer | kn <kn@openbsd.org> | 2018-11-05 15:13:56 +0000 |
| commit | 21faeea638efb74e8f3e4fc27f1b6d959e697216 (patch) | |
| tree | d24bb73435423c3b0287dfd3016c966f16739249 | |
| parent | snmpd(8)'s main process needs to open the config file and /dev/pf both with (diff) | |
| download | wireguard-openbsd-21faeea638efb74e8f3e4fc27f1b6d959e697216.tar.xz wireguard-openbsd-21faeea638efb74e8f3e4fc27f1b6d959e697216.zip | |
Fix kernel build without serial console
OK mpi
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/puc.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 29f4448a220..4f43c21e256 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.250 2018/07/30 09:04:52 jmatthew Exp $ */ +/* $OpenBSD: machdep.c,v 1.251 2018/11/05 15:13:56 kn Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1943,9 +1943,9 @@ getbootinfo(char *bootinfo, int bootinfo_size) case BOOTARG_CONSDEV: if (q->ba_size >= sizeof(bios_consdev_t) + offsetof(struct _boot_args32, ba_arg)) { +#if NCOM > 0 bios_consdev_t *cdp = (bios_consdev_t*)q->ba_arg; -#if NCOM > 0 static const int ports[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; int unit = minor(cdp->consdev); diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index 38d4d238319..4d105db4531 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puc.c,v 1.26 2018/05/02 19:11:01 phessler Exp $ */ +/* $OpenBSD: puc.c,v 1.27 2018/11/05 15:13:56 kn Exp $ */ /* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -164,6 +164,7 @@ puc_pci_attach(struct device *parent, struct device *self, void *aux) if (sc->sc_bar_mappings[i].mapped) continue; +#if NCOM > 0 /* * If a port on this card is used as serial console, * mapping the associated BAR will fail because the @@ -183,6 +184,7 @@ puc_pci_attach(struct device *parent, struct device *self, void *aux) sc->sc_bar_mappings[i].mapped = 1; continue; } +#endif printf("%s: couldn't map BAR at offset 0x%lx\n", sc->sc_dev.dv_xname, (long)bar); |