| Message ID | 20180829190400.23146-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | f6707fd6241e483f6fea2caae82d876e422bb11a |
| Headers | show |
| Series | of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC | expand |
diff --git a/drivers/of/base.c b/drivers/of/base.c index 466e3c8582f0..cadcb470198a 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1963,7 +1963,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;
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> --- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1