Merge branch 'stable/vga.support' into stable/drivers

* stable/vga.support:
  xen: allow enable use of VGA console on dom0
This commit is contained in:
Konrad Rzeszutek Wilk
2011-06-21 09:25:41 -04:00
5 changed files with 126 additions and 1 deletions

View File

@@ -1248,6 +1248,14 @@ asmlinkage void __init xen_start_kernel(void)
if (pci_xen)
x86_init.pci.arch_init = pci_xen_init;
} else {
const struct dom0_vga_console_info *info =
(void *)((char *)xen_start_info +
xen_start_info->console.dom0.info_off);
xen_init_vga(info, xen_start_info->console.dom0.info_size);
xen_start_info->console.domU.mfn = 0;
xen_start_info->console.domU.evtchn = 0;
/* Make sure ACS will be enabled */
pci_request_acs();
}