4.4-stable review patch.  If anyone has any objections, please let me know.


From: Arnd Bergmann <a...@arndb.de>

commit e36ae3439936e13c33f5841c7c2c1a9875acbb6d upstream.

xencons_disconnect_backend() is only called from xen_console_remove(),
which is conditionally compiled, so we get a harmless warning when

hvc/hvc_xen.c:350:12: error: 'xen_console_remove' defined but not used 

This moves the function down into the same #ifdef section to silence
the warning.

Signed-off-by: Arnd Bergmann <a...@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

 drivers/tty/hvc/hvc_xen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -323,6 +323,7 @@ void xen_console_resume(void)
 static void xencons_disconnect_backend(struct xencons_info *info)
        if (info->irq > 0)
@@ -363,7 +364,6 @@ static int xen_console_remove(struct xen
        return 0;
 static int xencons_remove(struct xenbus_device *dev)
        return xen_console_remove(dev_get_drvdata(&dev->dev));

Reply via email to