a7y18lte-ubports/android_kernel_samsung_a7y18lte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC

Browse Source 
[ 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>
This commit is contained in:
Rob Herring 2018-08-27 09:50:09 -05:00 committed by prashantpaddune
parent 345a4df38c
commit 4e8923dfb4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/of/base.c
View File

@ -2131,7 +2131,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" /* OF on pmac has nodes instead of properties named "l2-cache"
* beneath CPU nodes. * 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) for_each_child_of_node(np, child)
if (!strcmp(child->type, "cache")) if (!strcmp(child->type, "cache"))
return child; return child;