projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin' into irqdomain/next
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
linux
/
of.h
diff --git
a/include/linux/of.h
b/include/linux/of.h
index 0e9cf9eec08595d2432d9ae9b16f703475b54d07..e6c6b167949db1124273c4ca80ad533f15c362c8 100644
(file)
--- a/
include/linux/of.h
+++ b/
include/linux/of.h
@@
-21,6
+21,7
@@
#include <linux/kref.h>
#include <linux/mod_devicetable.h>
#include <linux/spinlock.h>
#include <linux/kref.h>
#include <linux/mod_devicetable.h>
#include <linux/spinlock.h>
+#include <linux/topology.h>
#include <asm/byteorder.h>
#include <asm/errno.h>
#include <asm/byteorder.h>
#include <asm/errno.h>
@@
-158,11
+159,6
@@
static inline unsigned long of_read_ulong(const __be32 *cell, int size)
#define OF_BAD_ADDR ((u64)-1)
#define OF_BAD_ADDR ((u64)-1)
-#ifndef of_node_to_nid
-static inline int of_node_to_nid(struct device_node *np) { return -1; }
-#define of_node_to_nid of_node_to_nid
-#endif
-
static inline const char* of_node_full_name(struct device_node *np)
{
return np ? np->full_name : "<no-node>";
static inline const char* of_node_full_name(struct device_node *np)
{
return np ? np->full_name : "<no-node>";
@@
-411,6
+407,15
@@
static inline int of_machine_is_compatible(const char *compat)
while (0)
#endif /* CONFIG_OF */
while (0)
#endif /* CONFIG_OF */
+#ifndef of_node_to_nid
+static inline int of_node_to_nid(struct device_node *np)
+{
+ return numa_node_id();
+}
+
+#define of_node_to_nid of_node_to_nid
+#endif
+
/**
* of_property_read_bool - Findfrom a property
* @np: device node from which the property value is to be read.
/**
* of_property_read_bool - Findfrom a property
* @np: device node from which the property value is to be read.