Received: by 10.213.65.68 with SMTP id h4csp1773169imn; Mon, 19 Mar 2018 12:53:18 -0700 (PDT) X-Google-Smtp-Source: AG47ELv+uey5I8eKd/Z0Gi4liGF6X7p0xoYnHD//LZTzdLC6/EjCmZ7JTi5qpAI+Bh+vUgUH+eTz X-Received: by 2002:a17:902:ab93:: with SMTP id f19-v6mr14089071plr.180.1521489198004; Mon, 19 Mar 2018 12:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521489197; cv=none; d=google.com; s=arc-20160816; b=DV3x6c2WEencFmOgcd7U/oY/y3EELSf4LrLvYLefzQZ3iYmtKYf9BdZlq1eBx6m2qa y3K3XpjPF0cMSGCrtMlbjqvZ7+yQIvddGebY420yfsOmUrtC58d3wBaB9pF5lpb/Nnr2 1WSiwRQ30CZmPUvCFXiyQG3TpEZcpkPqAkw813R6PlAr6LcyyqquwTS5ksnPsrAxFh/2 qISpQ7dmCHBxsK7akimsXwY5y/En05MZ/gi8n/9NuHYAjJ+511Vi5gLHYMS/FpsFkDZQ +x3ngAbc4wH0e3cvqszMalQqWqInl1Js73F1y+i2GkvKqXRXQW/GrwYIxO1Pmj5Zl0NK oRmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nS8rgg+QN91CVYX5EmJyVEJpVE4AL0u9NZNDo948xTw=; b=QzvI2XC27FfnrxG5E6xnpg7N1wPWrGNMMze7kRyLlhNa3MyFV0gu/58NDT2bcyWAp6 vHoCFMxufA3O4g/41TjcIGiLC9UeuE7bn62qtKOHB9BfG9ctkfM5ntyev36DdtlSmQQG 4q2Gapf+jfcA0NOrQH46oQCXoi3Ey5M/H/uqOgLwTdrmNAzlXMbnNYg3o9Jwh+V2M9LY stOqnaja52iqJgvaY8gHqe14TLnzRj4D5RD0xoK4Lc3vYBB1iG0d/d400SRunhPGgtc7 lCeCEraRnqikNo/NyqEyYf+N4/2ABMbq1e1bnIRXxe1rIAjNCtMY16HfIRIfNPbcVNRz LSGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k73si429582pgc.707.2018.03.19.12.53.04; Mon, 19 Mar 2018 12:53:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970747AbeCSTuB (ORCPT + 99 others); Mon, 19 Mar 2018 15:50:01 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47440 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934099AbeCSST5 (ORCPT ); Mon, 19 Mar 2018 14:19:57 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 385971070; Mon, 19 Mar 2018 18:19:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiko Carstens , Martin Schwidefsky , Sasha Levin Subject: [PATCH 4.9 047/241] s390/topology: fix typo in early topology code Date: Mon, 19 Mar 2018 19:05:12 +0100 Message-Id: <20180319180753.137554986@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiko Carstens [ 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 Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- 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);