summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/xen-ops.h
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-06-21 09:25:41 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-06-21 09:25:41 -0400
commitf7fdd84e04c8fdc9196abe3bfd27535bccb52ee5 (patch)
tree648238ca42c83a4dadf2ea436fd5a6c061c8404b /arch/x86/xen/xen-ops.h
parent03dc6107ff485995d356cb8a77766920e2eee21e (diff)
parentc2419b4a4727f67af2fc2cd68b0d878b75e781bb (diff)
downloadop-kernel-dev-f7fdd84e04c8fdc9196abe3bfd27535bccb52ee5.zip
op-kernel-dev-f7fdd84e04c8fdc9196abe3bfd27535bccb52ee5.tar.gz
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/xen-ops.h')
-rw-r--r--arch/x86/xen/xen-ops.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 97dfdc8..b095739 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -88,6 +88,17 @@ static inline void xen_uninit_lock_cpu(int cpu)
}
#endif
+struct dom0_vga_console_info;
+
+#ifdef CONFIG_XEN_DOM0
+void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);
+#else
+static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,
+ size_t size)
+{
+}
+#endif
+
/* Declare an asm function, along with symbols needed to make it
inlineable */
#define DECL_ASM(ret, name, ...) \
OpenPOWER on IntegriCloud