aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@xensource.com>2007-07-17 21:37:06 -0400
committerJeremy Fitzhardinge <jeremy@goop.org>2007-07-18 11:47:44 -0400
commitb536b4b9623084d86f2b1f19cb44a2d6d74f00bf (patch)
tree86c1981309dbd8b9bf120d4ddba50abd105af89a /arch
parent8b84ad942b534f8faeb34b68f0f7277ea375fed0 (diff)
xen: use the hvc console infrastructure for Xen console
Implement a Xen back-end for hvc console. * * * Add early printk support via hvc console, enable using "earlyprintk=xen" on the kernel command line. From: Gerd Hoffmann <kraxel@suse.de> Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/xen/events.c3
-rw-r--r--arch/x86_64/kernel/early_printk.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/i386/xen/events.c b/arch/i386/xen/events.c
index 4103b8bf22fd..8904acc20f8c 100644
--- a/arch/i386/xen/events.c
+++ b/arch/i386/xen/events.c
@@ -244,7 +244,7 @@ static int find_unbound_irq(void)
244 return irq; 244 return irq;
245} 245}
246 246
247static int bind_evtchn_to_irq(unsigned int evtchn) 247int bind_evtchn_to_irq(unsigned int evtchn)
248{ 248{
249 int irq; 249 int irq;
250 250
@@ -269,6 +269,7 @@ static int bind_evtchn_to_irq(unsigned int evtchn)
269 269
270 return irq; 270 return irq;
271} 271}
272EXPORT_SYMBOL_GPL(bind_evtchn_to_irq);
272 273
273static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu) 274static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
274{ 275{
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index 296d2b0c5d88..fd9aff3f3890 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -6,6 +6,7 @@
6#include <asm/io.h> 6#include <asm/io.h>
7#include <asm/processor.h> 7#include <asm/processor.h>
8#include <asm/fcntl.h> 8#include <asm/fcntl.h>
9#include <xen/hvc-console.h>
9 10
10/* Simple VGA output */ 11/* Simple VGA output */
11 12
@@ -242,6 +243,10 @@ static int __init setup_early_printk(char *buf)
242 simnow_init(buf + 6); 243 simnow_init(buf + 6);
243 early_console = &simnow_console; 244 early_console = &simnow_console;
244 keep_early = 1; 245 keep_early = 1;
246#ifdef CONFIG_HVC_XEN
247 } else if (!strncmp(buf, "xen", 3)) {
248 early_console = &xenboot_console;
249#endif
245 } 250 }
246 251
247 if (keep_early) 252 if (keep_early)