diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-21 09:25:41 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-21 09:25:41 -0400 |
| commit | f7fdd84e04c8fdc9196abe3bfd27535bccb52ee5 (patch) | |
| tree | 648238ca42c83a4dadf2ea436fd5a6c061c8404b /arch/x86/xen/enlighten.c | |
| parent | 03dc6107ff485995d356cb8a77766920e2eee21e (diff) | |
| parent | c2419b4a4727f67af2fc2cd68b0d878b75e781bb (diff) | |
Merge branch 'stable/vga.support' into stable/drivers
* stable/vga.support:
xen: allow enable use of VGA console on dom0
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 5525163a0398..53257421082b 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -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(); } |