From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A82BFC5DF60 for ; Fri, 8 Nov 2019 11:48:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DC7A22459 for ; Fri, 8 Nov 2019 11:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213683; bh=38CvKTUEfYqjatSWeb66xhp68C1ENMnN+gyu0nGU6rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YQHFJHT8STs4TdT9mxW1JNyjFI0u71ePVOudD5ykY8JHQ4JDyUuvoFbOEnQYlfFvQ yOsHDkfOZFmxGyADHqgugbz4t75rxX7C3+ICxVv7oQLlYaHF2jftQMy/3A1pNlSbWT Z46ufLVImFhj15zGYiq/W+BMZc0YoB/DcthtEeNo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391700AbfKHLsB (ORCPT ); Fri, 8 Nov 2019 06:48:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:36514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391646AbfKHLrr (ORCPT ); Fri, 8 Nov 2019 06:47:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E772721924; Fri, 8 Nov 2019 11:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213666; bh=38CvKTUEfYqjatSWeb66xhp68C1ENMnN+gyu0nGU6rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQ7AF/ICRy8AhnPbiAZ7qnfbPxyaXVGfWbpST2vrW2YTjWRK3Jt4PAVt8sYUTzymU EgvG0/82oi1K/IlLouGR6RA61k7XjFUJuBbOe4lFiX8kNq/dHBeEdG1u8lrKkmwpat Kot9blQ7F4sLcrzqnmphtQS4wh1PcGU2Al/FrD0Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rob Herring , Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 19/44] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Fri, 8 Nov 2019 06:46:55 -0500 Message-Id: <20191108114721.15944-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114721.15944-1-sashal@kernel.org> References: <20191108114721.15944-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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(-) 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; -- 2.20.1