projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
tty
/
hvc
/
hvc_xen.c
diff --git
a/drivers/tty/hvc/hvc_xen.c
b/drivers/tty/hvc/hvc_xen.c
index 71784950048fc8934fc092f0c73cabbeac46b9bc..5e87e4866bcb7b71c75d835d16b65335c4613f3e 100644
(file)
--- a/
drivers/tty/hvc/hvc_xen.c
+++ b/
drivers/tty/hvc/hvc_xen.c
@@
-163,7
+163,7
@@
static int domU_read_console(uint32_t vtermno, char *buf, int len)
return recv;
}
return recv;
}
-static struct hv_ops domU_hvc_ops = {
+static
const
struct hv_ops domU_hvc_ops = {
.get_chars = domU_read_console,
.put_chars = domU_write_console,
.notifier_add = notifier_add_irq,
.get_chars = domU_read_console,
.put_chars = domU_write_console,
.notifier_add = notifier_add_irq,
@@
-189,7
+189,7
@@
static int dom0_write_console(uint32_t vtermno, const char *str, int len)
return len;
}
return len;
}
-static struct hv_ops dom0_hvc_ops = {
+static
const
struct hv_ops dom0_hvc_ops = {
.get_chars = dom0_read_console,
.put_chars = dom0_write_console,
.notifier_add = notifier_add_irq,
.get_chars = dom0_read_console,
.put_chars = dom0_write_console,
.notifier_add = notifier_add_irq,
@@
-331,6
+331,7
@@
void xen_console_resume(void)
}
}
}
}
+#ifdef CONFIG_HVC_XEN_FRONTEND
static void xencons_disconnect_backend(struct xencons_info *info)
{
if (info->irq > 0)
static void xencons_disconnect_backend(struct xencons_info *info)
{
if (info->irq > 0)
@@
-371,7
+372,6
@@
static int xen_console_remove(struct xencons_info *info)
return 0;
}
return 0;
}
-#ifdef CONFIG_HVC_XEN_FRONTEND
static int xencons_remove(struct xenbus_device *dev)
{
return xen_console_remove(dev_get_drvdata(&dev->dev));
static int xencons_remove(struct xenbus_device *dev)
{
return xen_console_remove(dev_get_drvdata(&dev->dev));