From patchwork Tue Nov 19 05:17:55 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: 179690 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp166576ilf; Mon, 18 Nov 2019 21:47:08 -0800 (PST) X-Google-Smtp-Source: APXvYqya/D3Wknvhl30fpSChI1KMq4hSVZmwNw2+xB6Idv4M6k+MaRMz+Nv24tjyI/3IPj5Nk3GS X-Received: by 2002:a17:906:22c9:: with SMTP id q9mr31989172eja.198.1574142428789; Mon, 18 Nov 2019 21:47:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142428; cv=none; d=google.com; s=arc-20160816; b=hn5d5oV5QAIKcK+Hhr6fAcvF9zpCZjbqtK5DYU+xvEjNo7tEpYf23hZYK9MDSBYkuF aOqD4bhjjMrbMcOQDdBb3RrWb0LY84AfQWAHEIogMgW/PbOXvOrM/AUGHeDqooUyqrom I1DNVpVuG5MuDX8aUpNeBZHC0KKGF8kSAvJ4oNSXZzlBfVB9+25Osh74in74sa+4frhB pU7lJ7QAWS3uweB6NUTZxamoTkBhkJRp4a/ERYHFKv3BoGeyG1hKcOg09DzdI/dtiXkZ KtpM2ELuq3z+gfESZuFkmLzuXxXbel8xz6Hzm/MG/Fb3iXhow6+SmVZ7G+ki4yWynqLX usYQ== 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=hZ+/kUwoYTD9VyI2BUofrWGJomw07n+AOHx2qbnfKp4=; b=pwBwjEd9uGFEFVJUVZkvorlK0Y7OHyrqm/FmUIYbBmkHxaGuDRi8BDWeZuW13zcz6V JXQnUvjv9jU0x9sk4zUi9u4oeEhzW1bOZaH8gwteZbUfGVcO+thO2lhUeMDclC8vw2PP S4Ijh9br+ORKpk+GDIT3ypokrL36koK8G0OmJ5pPGHnLdKjNxBkL2DjvUftN6w+7O4UY 7EkHtFv+kFtP5HlEncLMiXzPhE+FYsUecAbpc/oDvoqFVVzIAf9xC4IZLsEGykkuhd6V mHyySh85c4djIYjf1wbTqPDJZmgnfNK5r0hbUOJ78E/KhvRjr8DfxtQZZQOBjaFtAN5G 9bIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LGeZGNWp; 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 d36si13699601ede.44.2019.11.18.21.47.08; Mon, 18 Nov 2019 21:47:08 -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=LGeZGNWp; 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 S1731200AbfKSFrG (ORCPT + 26 others); Tue, 19 Nov 2019 00:47:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:43342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731195AbfKSFrE (ORCPT ); Tue, 19 Nov 2019 00:47:04 -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 C3493222F2; Tue, 19 Nov 2019 05:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142423; bh=J3QJJyB1MLGclnznM8gAQWis/pWXjNNKzkTmxtMWMpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGeZGNWp46A22ND3rlglY8Q6Zq659ksh3COh8JHRIbm+/DSyA61Vu1Wion+Mo4RNi XKScuqN8jqWjJOURqJuac1yyrPWTU+8n4VjMqDhiDcgOip9QRutIQPp/wBzu1AB1Cs r+vGX0GaymkGKomcbMRMCJ+O26HhZkIUPS/mBvs0= 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.14 075/239] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Tue, 19 Nov 2019 06:17:55 +0100 Message-Id: <20191119051313.975899868@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@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 ce8a6e0c9b6a9..41b254be02954 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1837,7 +1837,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;