Commit 37ef1647 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.1-rc7' of git://

Pull driver core fixes from Greg KH:
 "Here are two fixes for the driver core that resolve some reported

  One is a regression from 4.0, the other a fixes a reported oops that
  has been there since 3.19.

  Both have been in linux-next for a while with no problems"

* tag 'driver-core-4.1-rc7' of git://
  drivers/base: cacheinfo: handle absence of caches
  drivers: of/base: move of_init to driver_init
parents eadc21f5 3370e13a
......@@ -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),
......@@ -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)
......@@ -189,7 +189,7 @@ int __of_attach_node_sysfs(struct device_node *np)
return 0;
static int __init of_init(void)
void __init of_core_init(void)
struct device_node *np;
......@@ -198,7 +198,8 @@ static int __init of_init(void)
of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj);
if (!of_kset) {
return -ENOMEM;
pr_err("devicetree: failed to register existing nodes\n");
......@@ -207,10 +208,7 @@ static int __init of_init(void)
/* Symlink in /proc as required by userspace ABI */
if (of_root)
proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base");
return 0;
static struct property *__of_find_property(const struct device_node *np,
const char *name, int *lenp)
......@@ -121,6 +121,8 @@ extern struct device_node *of_stdout;
extern raw_spinlock_t devtree_lock;
#ifdef CONFIG_OF
void of_core_init(void);
static inline bool is_of_node(struct fwnode_handle *fwnode)
return fwnode && fwnode->type == FWNODE_OF;
......@@ -376,6 +378,10 @@ bool of_console_check(struct device_node *dn, char *name, int index);
#else /* CONFIG_OF */
static inline void of_core_init(void)
static inline bool is_of_node(struct fwnode_handle *fwnode)
return false;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment