diff options
author | Tony Lindgren <tony@atomide.com> | 2015-06-09 23:37:31 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-06-09 23:37:31 -0700 |
commit | 63e63a1981c7247fea41ce97b3144befc8f2fb7b (patch) | |
tree | 74a5708579661a741b6c62096530e68aee949273 /drivers/base | |
parent | 5b83b2234be6733cfe22036c38031b2c890b3db8 (diff) | |
parent | a3e362f18c01f28abcb6d8e5d00be8b5d97ea09d (diff) | |
download | linux-63e63a1981c7247fea41ce97b3144befc8f2fb7b.tar.bz2 |
Merge branch 'wakeirq-8250' into omap-for-v4.2/wakeirq-v2
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/cacheinfo.c | 2 | ||||
-rw-r--r-- | drivers/base/init.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 9c2ba1c97c42..df0c66cb7ad3 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -179,7 +179,7 @@ static int detect_cache_attributes(unsigned int cpu) { int ret; - if (init_cache_level(cpu)) + if (init_cache_level(cpu) || !cache_leaves(cpu)) return -ENOENT; per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu), diff --git a/drivers/base/init.c b/drivers/base/init.c index da033d3bab3c..48c0e220acc0 100644 --- a/drivers/base/init.c +++ b/drivers/base/init.c @@ -8,6 +8,7 @@ #include <linux/device.h> #include <linux/init.h> #include <linux/memory.h> +#include <linux/of.h> #include "base.h" @@ -34,4 +35,5 @@ void __init driver_init(void) cpu_dev_init(); memory_dev_init(); container_dev_init(); + of_core_init(); } |