Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7721c4...
Commit: 7721c494a28e06543a3d6aa412957aa783a4a531
Parent: 91fcad19d03ed67cb50fd0e1913a8b89cc3ed3ec
Author: Christian Borntraeger <borntraeger@de.ibm.com>
AuthorDate: Fri Jul 25 12:06:06 2008 -0500
Committer: Rusty Russell <rusty@rustcorp.com.au>
CommitDate: Fri Jul 25 12:06:07 2008 +1000
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>
---
drivers/char/Kconfig | 6 +++++-
drivers/char/hvc_console.c | 4 ++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d825361..6c070dc 100644
--- a/drivers/char/Kconfig
+++ b/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/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 2f5b7fb..02aac10 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)
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)
{
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
