lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 104/475] ACPI: APEI: fix return value of __setup handlers
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit f3303ff649dbf7dcdc6a6e1a922235b12b3028f4 ]

    __setup() handlers should return 1 to indicate that the boot option
    has been handled. Returning 0 causes a boot option to be listed in
    the Unknown kernel command line parameters and also added to init's
    arg list (if no '=' sign) or environment list (if of the form 'a=b').

    Unknown kernel command line parameters "erst_disable
    bert_disable hest_disable BOOT_IMAGE=/boot/bzImage-517rc6", will be
    passed to user space.

    Run /sbin/init as init process
    with arguments:
    /sbin/init
    erst_disable
    bert_disable
    hest_disable
    with environment:
    HOME=/
    TERM=linux
    BOOT_IMAGE=/boot/bzImage-517rc6

    Fixes: a3e2acc5e37b ("ACPI / APEI: Add Boot Error Record Table (BERT) support")
    Fixes: a08f82d08053 ("ACPI, APEI, Error Record Serialization Table (ERST) support")
    Fixes: 9dc966641677 ("ACPI, APEI, HEST table parsing")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru>
    Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
    Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/acpi/apei/bert.c | 2 +-
    drivers/acpi/apei/erst.c | 2 +-
    drivers/acpi/apei/hest.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c
    index 1155fb9dcc3a..08d820c04618 100644
    --- a/drivers/acpi/apei/bert.c
    +++ b/drivers/acpi/apei/bert.c
    @@ -77,7 +77,7 @@ static int __init setup_bert_disable(char *str)
    {
    bert_disable = 1;

    - return 0;
    + return 1;
    }
    __setup("bert_disable", setup_bert_disable);

    diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
    index 2015a0967cbb..5ee3cb7fcd90 100644
    --- a/drivers/acpi/apei/erst.c
    +++ b/drivers/acpi/apei/erst.c
    @@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(erst_clear);
    static int __init setup_erst_disable(char *str)
    {
    erst_disable = 1;
    - return 0;
    + return 1;
    }

    __setup("erst_disable", setup_erst_disable);
    diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
    index 267bdbf6a7bf..add6416e78f2 100644
    --- a/drivers/acpi/apei/hest.c
    +++ b/drivers/acpi/apei/hest.c
    @@ -219,7 +219,7 @@ static int __init hest_ghes_dev_register(unsigned int ghes_count)
    static int __init setup_hest_disable(char *str)
    {
    hest_disable = HEST_DISABLED;
    - return 0;
    + return 1;
    }

    __setup("hest_disable", setup_hest_disable);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:35    [W:5.627 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site