From patchwork Fri Nov 22 10:27:01 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: 179962 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp15334ilf; Fri, 22 Nov 2019 02:33:57 -0800 (PST) X-Google-Smtp-Source: APXvYqyjA9UWAJ4cSPPOUw2iOWtmhMitjIkdq/3lF49pTdxcZYlDQK6IcUmBrq6HMcrh4dOV2YPB X-Received: by 2002:a50:f612:: with SMTP id c18mr184317edn.285.1574418836988; Fri, 22 Nov 2019 02:33:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574418836; cv=none; d=google.com; s=arc-20160816; b=nBgDowiZ39daniDC6jGhuoVlfcm0kj4+jJxjncyER5LnbWKGG8/0L4cWLZOrn4B367 mSBPwFo1Uu++OgVoIifVZuie8inSI4Khy58pDCmXeIXn2/+tm5V9EoWlS4H4RDiabgUt 8tVafcAnjbBaNMTP1V8M5gB+r/dCYsP1WO3akyN8eUA/mpF9GphS6eq5MHnPCzd10kiR osnKypS1ic2fVYjZcbXbE5m/vtcY71hZCTt1am0fnJW0T1CpZDqfibd6NYdkpLSZ8mET TWJHXet9E1Q6e1uOHzr1yHfnGc75nvQp3z2cn1ryUFswrrwS/Vqz99AZzGr5wKUIULUt Betw== 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=Lye6g5K8sYEIvQm/19BU7FzGajs6ggOt5rKRzee7qSM=; b=GiqaLR0l0rdCojEe4FRyjSBCgGeQkHVC6fo3TV6WixnTDG3uFgCFshrJfNE8MB+cYR /k9BlF5NnhufgbLoldjKxpfqbSnSPbKdzUhsY306Y/jFGt0JP7XvsTGINDUVJbzPrQE3 q5O8QmZ4ad0HUbxN76/nlrqisTHHV+rE3WC0alyUHaM3pkGNyONryWnLCwwNqXGq8+CK UohHy+WlSMz0yLCsUIRHW/nxUPXtGbwIsN2E3hLQ6k/Nu4yJlS9pwVWkHQtDmK8dxxMR HY9eHn7K/GIiggJW2+yIySs6Y4zlLXtdzRyZWeKcxDXWcOrZUwxD7xC078W3IFAooJCW NA1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vlcxc2Mh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 f13si4052870ejc.311.2019.11.22.02.33.56; Fri, 22 Nov 2019 02:33:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=vlcxc2Mh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728002AbfKVKdy (ORCPT + 15 others); Fri, 22 Nov 2019 05:33:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:57458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728008AbfKVKdx (ORCPT ); Fri, 22 Nov 2019 05:33:53 -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 3D55720656; Fri, 22 Nov 2019 10:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418832; bh=38CvKTUEfYqjatSWeb66xhp68C1ENMnN+gyu0nGU6rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vlcxc2MhU66FP/Pe5AF/9V4vFoEkLYn0PL2c84R/3n3sf+QN5rG0xOp4e2wWrJTMg W1QA7taGY2gfHLGaGQ+eB+SAzJMnd6vlu/9Yem1+390dFBvpa4HiXpmnIj3JDmy7rV BZJWZQAkENP9PBpxsnYXDQKAcbj1WXslMKyFaI3k= 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.4 030/159] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Fri, 22 Nov 2019 11:27:01 +0100 Message-Id: <20191122100727.662574228@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 c6e019208d171..27783223ca5cd 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2125,7 +2125,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;