s390/topology: fix typo in early topology code
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 13 Mar 2017 12:36:10 +0000 (13:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Mar 2018 08:17:41 +0000 (09:17 +0100)
[ 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

index 29d8744..6257898 100644 (file)
@@ -372,7 +372,7 @@ static int __init topology_setup(char *str)
 
        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);