lkml.org 
[lkml]   [2014]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 123/182] drivers/tty/hvc: don't free hvc_console_setup after init
    Date
    From: Tomoki Sekiyama <tomoki.sekiyama@hds.com>

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

    ===============

    commit 501fed45b7e8836ee9373f4d31e2d85e3db6103a upstream.

    When 'console=hvc0' is specified to the kernel parameter in x86 KVM guest,
    hvc console is setup within a kthread. However, that will cause SEGV
    and the boot will fail when the driver is builtin to the kernel,
    because currently hvc_console_setup() is annotated with '__init'. This
    patch removes '__init' to boot the guest successfully with 'console=hvc0'.

    Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/hvc/hvc_console.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
    index 620da5f88e91..e8e06d82acf0 100644
    --- a/drivers/tty/hvc/hvc_console.c
    +++ b/drivers/tty/hvc/hvc_console.c
    @@ -190,7 +190,7 @@ static struct tty_driver *hvc_console_device(struct console *c, int *index)
    return hvc_driver;
    }

    -static int __init hvc_console_setup(struct console *co, char *options)
    +static int hvc_console_setup(struct console *co, char *options)
    {
    if (co->index < 0 || co->index >= MAX_NR_HVC_CONSOLES)
    return -ENODEV;
    --
    1.9.3


    \
     
     \ /
      Last update: 2014-05-13 12:41    [W:4.078 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site