diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-10 10:28:03 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-10 10:28:03 -0700 |
| commit | cec285f5fdb58cc760d0b882f9a2d94d7ff21a8a (patch) | |
| tree | 88e8a378175c9661554305eee42498a500d4d6dc /include/linux/of.h | |
| parent | 524b802ce0de62e8accdd0efd08b5db7766f13c3 (diff) | |
| parent | e9fd6ddcabf8695329f2462d3ece5a8442f2a8cf (diff) | |
Merge tag 'v3.18.20' into linux-linaro-lsk-v3.18
Linux 3.18.20
* tag 'v3.18.20': (52 commits)
Linux 3.18.20
blk-mq: fix CPU hotplug handling
SCSI: add 1024 max sectors black list flag
Fix firmware loader uevent buffer NULL pointer dereference
arm64: Don't report clear pmds and puds as huge
9p: don't leave a half-initialized inode sitting around
9p: forgetting to cancel request on interrupted zero-copy RPC
NFS: Fix size of NFSACL SETACL operations
watchdog: omap: assert the counter being stopped before reprogramming
of: return NUMA_NO_NODE from fallback of_node_to_nid()
USB: usbfs: allow URBs to be reaped after disconnection
dell-laptop: Fix allocating & freeing SMI buffer page
mac80211: prevent possible crypto tx tailroom corruption
security_syslog() should be called once only
__bitmap_parselist: fix bug in empty string handling
mmc: card: Fixup request missing in mmc_blk_issue_rw_rq
iser-target: Fix possible deadlock in RDMA_CM connection error
iscsi-target: Convert iscsi_thread_set usage to kthread.h
ACPICA: Tables: Fix an issue that FACS initialization is performed twice
Btrfs: fix memory leak in the extent_same ioctl
...
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index ce9f6a2b3532..4a6a489a7506 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -593,7 +593,10 @@ static inline const char *of_prop_next_string(struct property *prop, #if defined(CONFIG_OF) && defined(CONFIG_NUMA) extern int of_node_to_nid(struct device_node *np); #else -static inline int of_node_to_nid(struct device_node *device) { return 0; } +static inline int of_node_to_nid(struct device_node *device) +{ + return NUMA_NO_NODE; +} #endif static inline struct device_node *of_find_matching_node( |