diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-18 20:50:33 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-18 20:50:33 +0000 |
commit | 99687559e46be79e7b0b8f57570928e341b24a6d (patch) | |
tree | 81dfd6f7a0930769a1c801edc370da8ed5d48021 /include | |
parent | 041be7a254157109dec33e38ff9fe5c6fea60299 (diff) | |
parent | 2eb736d6b425cb932b038fd555243b9b0e59c036 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/of_device.h | 15 | ||||
-rw-r--r-- | include/linux/reboot.h | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 901b7435e890..192c783c2ec6 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -1,6 +1,7 @@ #ifndef _LINUX_OF_DEVICE_H #define _LINUX_OF_DEVICE_H +#include <linux/cpu.h> #include <linux/platform_device.h> #include <linux/of_platform.h> /* temporary until merge */ @@ -43,6 +44,15 @@ static inline void of_device_node_put(struct device *dev) of_node_put(dev->of_node); } +static inline struct device_node *of_cpu_device_node_get(int cpu) +{ + struct device *cpu_dev; + cpu_dev = get_cpu_device(cpu); + if (!cpu_dev) + return NULL; + return of_node_get(cpu_dev->of_node); +} + #else /* CONFIG_OF_DEVICE */ static inline int of_driver_match_device(struct device *dev, @@ -67,6 +77,11 @@ static inline const struct of_device_id *of_match_device( { return NULL; } + +static inline struct device_node *of_cpu_device_node_get(int cpu) +{ + return NULL; +} #endif /* CONFIG_OF_DEVICE */ #endif /* _LINUX_OF_DEVICE_H */ diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 23b36304cd88..2ca9ed7cfc9b 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -10,6 +10,11 @@ #define SYS_HALT 0x0002 /* Notify of system halt */ #define SYS_POWER_OFF 0x0003 /* Notify of system power off */ +enum reboot_mode { + REBOOT_COLD = 0, + REBOOT_WARM, +}; + extern int register_reboot_notifier(struct notifier_block *); extern int unregister_reboot_notifier(struct notifier_block *); |