OSDN Git Service

of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
authorRob Herring <robh@kernel.org>
Mon, 27 Aug 2018 14:50:09 +0000 (09:50 -0500)
committerRob Herring <robh@kernel.org>
Fri, 7 Sep 2018 16:04:41 +0000 (11:04 -0500)
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

index 9095b82..a055cd1 100644 (file)
@@ -2010,7 +2010,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;