aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2008-07-25 13:06:06 -0400
committerRusty Russell <rusty@rustcorp.com.au>2008-07-24 22:06:07 -0400
commit7721c494a28e06543a3d6aa412957aa783a4a531 (patch)
treea37e13bcdf0029df3b22cec1b64caa7d549d92a8
parent91fcad19d03ed67cb50fd0e1913a8b89cc3ed3ec (diff)
virtio: console as a config option
I also added a small Kconfig change that allows the user to specify the virtio console in menuconfig. (Fixes to export symbols from Stephen Rothwell <sfr@canb.auug.org.au>) (Fixes for CONFIG_VIRTIO_CONSOLE=y vs CONFIG_VIRTIO=m from Christian himself) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--drivers/char/Kconfig6
-rw-r--r--drivers/char/hvc_console.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d825361a6baf..6c070dc5f2d4 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -624,8 +624,12 @@ config HVC_XEN
624 Xen virtual console device driver 624 Xen virtual console device driver
625 625
626config VIRTIO_CONSOLE 626config VIRTIO_CONSOLE
627 bool 627 tristate "Virtio console"
628 depends on VIRTIO
628 select HVC_DRIVER 629 select HVC_DRIVER
630 help
631 Virtio console for use with lguest and other hypervisors.
632
629 633
630config HVCS 634config HVCS
631 tristate "IBM Hypervisor Virtual Console Server support" 635 tristate "IBM Hypervisor Virtual Console Server support"
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 2f5b7fb67045..02aac104842d 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -280,6 +280,7 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
280 280
281 return 0; 281 return 0;
282} 282}
283EXPORT_SYMBOL_GPL(hvc_instantiate);
283 284
284/* Wake the sleeping khvcd */ 285/* Wake the sleeping khvcd */
285void hvc_kick(void) 286void hvc_kick(void)
@@ -287,6 +288,7 @@ void hvc_kick(void)
287 hvc_kicked = 1; 288 hvc_kicked = 1;
288 wake_up_process(hvc_task); 289 wake_up_process(hvc_task);
289} 290}
291EXPORT_SYMBOL_GPL(hvc_kick);
290 292
291static void hvc_unthrottle(struct tty_struct *tty) 293static void hvc_unthrottle(struct tty_struct *tty)
292{ 294{
@@ -629,6 +631,7 @@ int hvc_poll(struct hvc_struct *hp)
629 631
630 return poll_mask; 632 return poll_mask;
631} 633}
634EXPORT_SYMBOL_GPL(hvc_poll);
632 635
633/* 636/*
634 * This kthread is either polling or interrupt driven. This is determined by 637 * 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,
739 742
740 return hp; 743 return hp;
741} 744}
745EXPORT_SYMBOL_GPL(hvc_alloc);
742 746
743int __devexit hvc_remove(struct hvc_struct *hp) 747int __devexit hvc_remove(struct hvc_struct *hp)
744{ 748{