d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Record the dependency to x86bios in vga_pci

Browse Source 
This fixes the build of XEN and XBOX kernels on i386, which was broken
in r279487.

While here, do not build vga_pci_repost() on PC98.

Reported by:	bz@
This commit is contained in:
Jean-Sébastien Pédron 2015-03-01 20:54:29 +00:00
parent a737ef56ab
commit 3d7f3c9d52
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/conf/files.amd64
View File

@ -513,10 +513,10 @@ compat/ndis/winx64_wrap.S optional ndisapi pci
libkern/memmove.c standard
libkern/memset.c standard
#
# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
# x86 real mode BIOS emulator, required by atkbdc/dpms/pci/vesa
#
compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa
contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa
compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | pci | vesa
contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | pci | vesa
#
# bvm console
#

4
sys/conf/files.i386
View File

@ -531,9 +531,9 @@ i386/xbox/xboxfb.c optional xboxfb
dev/fb/boot_font.c optional xboxfb
i386/xbox/pic16l.s optional xbox
#
# x86 real mode BIOS support, required by atkbdc/dpms/vesa
# x86 real mode BIOS support, required by atkbdc/dpms/pci/vesa
#
compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa
compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | pci | vesa
#
# bvm console
#

3
sys/dev/pci/vga_pci.c
View File

@ -199,7 +199,7 @@ vga_pci_unmap_bios(device_t dev, void *bios)
int
vga_pci_repost(device_t dev)
{
#if defined(__amd64__) || defined(__i386__)
#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
x86regs_t regs;
if (!vga_pci_is_boot_display(dev))
@ -633,3 +633,4 @@ static driver_t vga_pci_driver = {
static devclass_t vga_devclass;
DRIVER_MODULE(vgapci, pci, vga_pci_driver, vga_devclass, 0, 0);
MODULE_DEPEND(vgapci, x86bios, 1, 1, 1);