Merge tag 'v3.12-rc4' into next

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_xen.c

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 682210d778bd05ae9dafd7779a0f189919e5f9f0..c193af6a628f45758a7fcd59b1b0823e57327655 100644 (file)
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -208,7 +208,7 @@ static int xen_hvm_console_init(void)
 
        info = vtermno_to_xencons(HVC_COOKIE);
        if (!info) {
-               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
+               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL);
                if (!info)
                        return -ENOMEM;
        } else if (info->intf != NULL) {
@@ -257,7 +257,7 @@ static int xen_pv_console_init(void)
 
        info = vtermno_to_xencons(HVC_COOKIE);
        if (!info) {
-               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
+               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL);
                if (!info)
                        return -ENOMEM;
        } else if (info->intf != NULL) {
@@ -284,7 +284,7 @@ static int xen_initial_domain_console_init(void)
 
        info = vtermno_to_xencons(HVC_COOKIE);
        if (!info) {
-               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
+               info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL);
                if (!info)
                        return -ENOMEM;
        }
@@ -636,6 +636,7 @@ struct console xenboot_console = {
        .name           = "xenboot",
        .write          = xenboot_write_console,
        .flags          = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
+       .index          = -1,
 };
 #endif /* CONFIG_EARLY_PRINTK */