Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

[pandora-kernel.git] / drivers / xen / xenbus / xenbus_probe_frontend.c

diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
index 9c57819..f20c5f1 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe_frontend.c
+++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -53,6 +53,12 @@ static int xenbus_probe_frontend(struct xen_bus_type *bus, const char *type,
        char *nodename;
        int err;
 
+       /* ignore console/0 */
+       if (!strncmp(type, "console", 7) && !strncmp(name, "0", 1)) {
+               DPRINTK("Ignoring buggy device entry console/0");
+               return 0;
+       }
+
        nodename = kasprintf(GFP_KERNEL, "%s/%s/%s", bus->root, type, name);
        if (!nodename)
                return -ENOMEM;