diff options
| author | Rob Herring <robh@kernel.org> | 2018-08-27 09:50:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-25 09:52:08 +0100 |
| commit | 30efd0c2ef108d5138fcc1b8b5b8d5207909820e (patch) | |
| tree | cb98ab693535ef4be19c26d813502db089ca3785 | |
| parent | 19223f9d87c7888353177727f1359d4eddcef376 (diff) | |
| download | linux-stable-30efd0c2ef108d5138fcc1b8b5b8d5207909820e.tar.gz linux-stable-30efd0c2ef108d5138fcc1b8b5b8d5207909820e.tar.bz2 linux-stable-30efd0c2ef108d5138fcc1b8b5b8d5207909820e.zip | |
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 <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/of/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index f366af135d5b..c66cdc4307fd 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; |