From patchwork Tue Nov 19 05:15:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179638 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp151229ilf; Mon, 18 Nov 2019 21:29:41 -0800 (PST) X-Google-Smtp-Source: APXvYqx/MOagt5nOYt3YXn83rfEOzE0hI1Hh0tbbuJVGGMilSHOBEww2tE+vQJ2dX23uiGL81Uk1 X-Received: by 2002:a17:906:230f:: with SMTP id l15mr31636365eja.222.1574141381144; Mon, 18 Nov 2019 21:29:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141381; cv=none; d=google.com; s=arc-20160816; b=042AprHIYq0Za1xJrsIlL4l5YT7XcB0Gr4BeBMNBAnTIqtyQnVTaQ5aT92WeAtgdfO +vmexuyrLoLOmUzIAHBV3+GoJBgGZAblhOICCn6miruMOlOoKaXtkezp8MbZPZqW0rb8 YoA8V8pxmPKsccqe1+rD4XJu+KjSlJvy5hBBj+Oeel6l22RPi3MeDliN06roCvEHGW41 7rUibNutGlpY7FFUmdswSsj8WwyauysOmf6JG2TEJxF5qjb7eDCmzC0X8PNUSu0aNaRb M7PbCRjLZxKOwZ/BI0swoVocfQD7pu/N72HR4xEueDMVQ+NFRsva+yq2u3VQQ1SA9oIA Az+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Hlg53ybD4Aso4vqhdFymtZRN2NNnf9SvV5E8euUUgM0=; b=i5h3wtDrP3zbHhtI+Um+mY25yYNH18+ipbrzvA7wxm/XNDiwUWWJwgZlYWWIiI8Gwz gTWUVN6LSmdqdwIAG5hJL2XzXbYxrKnnrCnAaW4zPNkNaYRj6AWsYiY6Phd1lb441XVl lVprzC0LcmlfZT032gYkZG7euERfueEGBdDu3cVqD9rlJzd81Sb21RrSwjUw40DHyFHq qH3gQnpMNMsNlO9vX/XHPHT6OkMe4UI9pH1NQYUKNjF8Gw3yT+bE+SJWaM+W5pM9WhLb Q3RYYadnuK8eEnR6LVAozE2UtWqS41roTri3AxxhlnKi1Z37F0NfOpkw58PajcsvYFLd S2tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EIBC02IK; 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 h6si14597268eda.258.2019.11.18.21.29.40; Mon, 18 Nov 2019 21:29:41 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=EIBC02IK; 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 S1729022AbfKSF3j (ORCPT + 26 others); Tue, 19 Nov 2019 00:29:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:48202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728997AbfKSF3f (ORCPT ); Tue, 19 Nov 2019 00:29:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7863E21783; Tue, 19 Nov 2019 05:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141375; bh=Bg1NB1Okm9z6Vy/N4uGACFmVAuYujxub6R0M02NRtRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EIBC02IKkVRpgJEVqpRa16qZ3Yp+A96T1Id/Ha3k3meqpdLDVgCeao2D/lNsRMCBo Pm1F2+povMiL1gWKDTC+1tOIV9Mfaao2nR5HB7/b/CSkIqdg0ldTwtfcM/ROJlVRbi Ihxyvwg71aF+FwEoOz6xKR9r8bKIo89WVYHXP3Q4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 137/422] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Tue, 19 Nov 2019 06:15:34 +0100 Message-Id: <20191119051407.693045459@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ] Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that. Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/of/base.c b/drivers/of/base.c index 3f21ea6a90dcb..f0dbb7ad88cf6 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2066,7 +2066,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np) /* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes. */ - if (!strcmp(np->type, "cpu")) + if (IS_ENABLED(CONFIG_PPC_PMAC) && !strcmp(np->type, "cpu")) for_each_child_of_node(np, child) if (!strcmp(child->type, "cache")) return child;