diff options
| author | ray <ray@FreeBSD.org> | 2014-05-05 22:10:31 +0000 |
|---|---|---|
| committer | ray <ray@FreeBSD.org> | 2014-05-05 22:10:31 +0000 |
| commit | 9be8a6b14aa116da13f0579b9e06d6a399d9e3b7 (patch) | |
| tree | fd8cad85461badc2ea29447ac6f2a838a47799e3 | |
| parent | 22742fe448c8c25da57b2411c8062d03c57d41e0 (diff) | |
| download | FreeBSD-src-9be8a6b14aa116da13f0579b9e06d6a399d9e3b7.zip FreeBSD-src-9be8a6b14aa116da13f0579b9e06d6a399d9e3b7.tar.gz | |
Revert r264997 and r265026. It is not required anymore.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/dev/vt/hw/vga/vga.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sys/dev/vt/hw/vga/vga.c b/sys/dev/vt/hw/vga/vga.c index 16e0751..13c640a 100644 --- a/sys/dev/vt/hw/vga/vga.c +++ b/sys/dev/vt/hw/vga/vga.c @@ -45,10 +45,8 @@ __FBSDID("$FreeBSD$"); #if defined(__amd64__) || defined(__i386__) #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/metadata.h> #include <machine/pmap.h> #include <machine/vmparam.h> -#include <sys/linker.h> #endif /* __amd64__ || __i386__ */ struct vga_softc { @@ -638,19 +636,6 @@ vga_init(struct vt_device *vd) struct vga_softc *sc = vd->vd_softc; int textmode = 0; -#if defined(__amd64__) - /* Disable if EFI framebuffer present. Should be handled by priority - * logic in vt(9), but this will do for now. XXX */ - - caddr_t kmdp, efifb; - kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf64 kernel"); - efifb = preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_FB); - if (efifb != NULL) - return (CN_DEAD); -#endif - #if defined(__amd64__) || defined(__i386__) sc->vga_fb_tag = X86_BUS_SPACE_MEM; sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE; |
