diff options
| author |   kettenis <kettenis@openbsd.org> | 2015-08-30 18:08:24 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2015-08-30 18:08:24 +0000 |
| commit | 030e72154b2387bd258d30d191bf04880a5aed7c (patch) | |
| tree | 63d35010e9aa1ec5bfdb4a506be62ee442967290 | |
| parent | In readgptlabel() avoid pointless conversions from sector counts (diff) | |
| download | wireguard-openbsd-030e72154b2387bd258d30d191bf04880a5aed7c.tar.xz wireguard-openbsd-030e72154b2387bd258d30d191bf04880a5aed7c.zip | |
Don't try to attach efifb(4) on non-UEFI boots.
ok miod@, deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/mainbus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c index d75b6ccdb36..951fd69923b 100644 --- a/sys/arch/amd64/amd64/mainbus.c +++ b/sys/arch/amd64/amd64/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.31 2015/08/30 10:05:09 yasuoka Exp $ */ +/* $OpenBSD: mainbus.c,v 1.32 2015/08/30 18:08:24 kettenis Exp $ */ /* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */ /* @@ -231,11 +231,13 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) if (isa_has_been_seen == 0) config_found(self, &mba_iba, mainbus_print); #endif + #if NEFIFB > 0 - mba.mba_busname = "efifb"; - config_found(self, &mba, mainbus_print); + if (bios_efiinfo != NULL) { + mba.mba_busname = "efifb"; + config_found(self, &mba, mainbus_print); + } #endif - } int |