From: Rob Herring Date: Mon, 27 Aug 2018 14:50:09 +0000 (-0500) Subject: of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9032374066b416e1ade7b97b8a8f3c7c304c1faa;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC [ 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 --- diff --git a/drivers/of/base.c b/drivers/of/base.c index ce8a6e0c9b6a..41b254be0295 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;