From 97bed553c3866568db21b9cc86a3e6b247138dd0 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Fri, 25 Jul 2008 12:06:06 -0500 Subject: [PATCH] --- yaml --- r: 105771 b: refs/heads/master c: 7721c494a28e06543a3d6aa412957aa783a4a531 h: refs/heads/master i: 105769: cb312fb28dfc90a99690479ae06778fc7dc08e4c 105767: 8ad4822861c5e7e3e29e60e92410fc360d99fc79 v: v3 --- [refs] | 2 +- trunk/drivers/char/Kconfig | 6 +++++- trunk/drivers/char/hvc_console.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f99a62da52f7..54709fc379ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91fcad19d03ed67cb50fd0e1913a8b89cc3ed3ec +refs/heads/master: 7721c494a28e06543a3d6aa412957aa783a4a531 diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig index d825361a6baf..6c070dc5f2d4 100644 --- a/trunk/drivers/char/Kconfig +++ b/trunk/drivers/char/Kconfig @@ -624,8 +624,12 @@ config HVC_XEN Xen virtual console device driver config VIRTIO_CONSOLE - bool + tristate "Virtio console" + depends on VIRTIO select HVC_DRIVER + help + Virtio console for use with lguest and other hypervisors. + config HVCS tristate "IBM Hypervisor Virtual Console Server support" diff --git a/trunk/drivers/char/hvc_console.c b/trunk/drivers/char/hvc_console.c index 2f5b7fb67045..02aac104842d 100644 --- a/trunk/drivers/char/hvc_console.c +++ b/trunk/drivers/char/hvc_console.c @@ -280,6 +280,7 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops) return 0; } +EXPORT_SYMBOL_GPL(hvc_instantiate); /* Wake the sleeping khvcd */ void hvc_kick(void) @@ -287,6 +288,7 @@ void hvc_kick(void) hvc_kicked = 1; wake_up_process(hvc_task); } +EXPORT_SYMBOL_GPL(hvc_kick); static void hvc_unthrottle(struct tty_struct *tty) { @@ -629,6 +631,7 @@ int hvc_poll(struct hvc_struct *hp) return poll_mask; } +EXPORT_SYMBOL_GPL(hvc_poll); /* * This kthread is either polling or interrupt driven. This is determined by @@ -739,6 +742,7 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, return hp; } +EXPORT_SYMBOL_GPL(hvc_alloc); int __devexit hvc_remove(struct hvc_struct *hp) {