lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 047/241] s390/topology: fix typo in early topology code
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Heiko Carstens <heiko.carstens@de.ibm.com>


    [ Upstream commit 4fd4dd8bffb112d1e6549e0ff09e9fa3c8cc2b96 ]

    Use MACHINE_FLAG_TOPOLOGY instead of MACHINE_HAS_TOPOLOGY when
    clearing the bit that indicates if the machine provides topology
    information (and if it should be used). Currently works anyway.

    Fixes: 68cc795d1933 ("s390/topology: make "topology=off" parameter work")
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/s390/kernel/early.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/s390/kernel/early.c
    +++ b/arch/s390/kernel/early.c
    @@ -372,7 +372,7 @@ static int __init topology_setup(char *s

    rc = kstrtobool(str, &enabled);
    if (!rc && !enabled)
    - S390_lowcore.machine_flags &= ~MACHINE_HAS_TOPOLOGY;
    + S390_lowcore.machine_flags &= ~MACHINE_FLAG_TOPOLOGY;
    return rc;
    }
    early_param("topology", topology_setup);

    \
     
     \ /
      Last update: 2018-03-19 20:51    [W:4.271 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site