svn commit: r279494 - in head/sys: conf dev/pci

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Sun Mar  1 20:54:29 2015
New Revision: 279494
URL: https://svnweb.freebsd.org/changeset/base/279494

Log:
  Record the dependency to x86bios in vga_pci
  
  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@

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/dev/pci/vga_pci.c

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Sun Mar  1 20:32:47 2015	(r279493)
+++ head/sys/conf/files.amd64	Sun Mar  1 20:54:29 2015	(r279494)
@@ -513,10 +513,10 @@ compat/ndis/winx64_wrap.S	optional	ndisa
 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
 #

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sun Mar  1 20:32:47 2015	(r279493)
+++ head/sys/conf/files.i386	Sun Mar  1 20:54:29 2015	(r279494)
@@ -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
 #

Modified: head/sys/dev/pci/vga_pci.c
==============================================================================
--- head/sys/dev/pci/vga_pci.c	Sun Mar  1 20:32:47 2015	(r279493)
+++ head/sys/dev/pci/vga_pci.c	Sun Mar  1 20:54:29 2015	(r279494)
@@ -199,7 +199,7 @@ vga_pci_unmap_bios(device_t dev, void *b
 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);