From patchwork Fri Nov 22 10:26:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179968 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp22743ilf; Fri, 22 Nov 2019 02:40:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzI3J3i43RAsVn25H/Zb1jZFYkLDLdEvn/NhKM90sPV8D/HQPsfUviC0E+5fZvrmAdkGJ5i X-Received: by 2002:aa7:cf91:: with SMTP id z17mr212994edx.93.1574419239131; Fri, 22 Nov 2019 02:40:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419239; cv=none; d=google.com; s=arc-20160816; b=ewZkI3sMO91YdkX4f8UljbRR92er9W5WAF1CF7VBh9yQ7CPH0p1uvR3PGlZiIpFVFD HAd1FkwhBffINhQ4iQ4GL1dZqchvXcLjxydc/bttwr86/rX5tTrk7TX+MsGcWPE2+r0T eDoIEvuc79u4ieNcsX7nRkoEgJmlTJVW4KtYeeVk88lrqdnbRHc8G+0KZudqrXd7ji6L ARWtED4Dm2TL6lfubcJcjPVI3/KAgMLsVc7yWc1mrdAKXs5LUIkroedVjPZ7RuTXFhyh 4J4/aOh5Ke19DKIlsjZtBMXLY036cmRIiQmplpSwCzUV/kHZnTrztoz36aKWKCv+8Axq gu7A== 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=K4sZtBCOr5hJtY1rrpuCPgQhGgatcvrdgdT1atsaOG8=; b=Y78Y1jS9aijy8cw2RLi8HH7w5inOeCgX8B2/bh+zjYBxtv4u3O4/5xrK0wUZLCiTu4 BusQKgTrJ6j5bZ5EGtqcrIHMETWo9VKXh+ToJECBWQgpL1t0MpMN36IXWN0fQ5fjVLLw uTkqHCn4JHr8q/XXP7swt5mO2PS3KeqTCBhfDyNYnD2gdQmvf1Fa2bhCDQFQTXEo7hEn WC1rpDhf/GrQe21gPwpfvaFt8iKFehKNS4MpPBlpcR54f1vFwkkzeetwXZjC22Vd8Coa ZKTdd4tN6JoVQfhrlVeBoPmdnYRfJF0XJ2itEGnbGnzoKSbjeIdVVpfxM1zAB/Da3Y1+ l7kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ucu3LWK9; 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 r25si3868324eji.283.2019.11.22.02.40.38; Fri, 22 Nov 2019 02:40:39 -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=ucu3LWK9; 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 S1728524AbfKVKkg (ORCPT + 26 others); Fri, 22 Nov 2019 05:40:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:44496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728169AbfKVKkd (ORCPT ); Fri, 22 Nov 2019 05:40:33 -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 101D720718; Fri, 22 Nov 2019 10:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419232; bh=NNy9gPCO4JUqhtpquihz7LUYZZvWXZ2gaAYc6Wye+qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ucu3LWK9x7xdISVKD74L0jxOQZ+C8XJhBL0x5JfGYxCf7CZFAjKQZUoPU8G57ykW6 DXi6fx+agHtdv0dQii4HvGj8p94RHuJw4AU466OZamDkJRzfVFE78xDJSnCIvSg4Nt skjlu7eYp2ztLoM9Wedl43ZpWo8JG+X1kz/BxmCw= 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.9 042/222] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Fri, 22 Nov 2019 11:26:22 +0100 Message-Id: <20191122100850.205667085@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 f366af135d5b7..c66cdc4307fd7 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2281,7 +2281,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;