diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2023-12-18 13:31:29 +0100 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2023-12-18 13:31:29 +0100 |
| commit | 12b7f4ddfcb66dafed432cf4a987f5b40179c0f1 (patch) | |
| tree | 1e57a7d047e575d891302fb68fdfcd682fe84a5f /include/linux/hrtimer.h | |
| parent | 0e6e3c6f7cb47ea1ae15a8148a6ddb30035c210e (diff) | |
| parent | 826a5d8c9df9605fb4fdefa45432f95580241a1f (diff) | |
Merge tag 'device_is_big_endian-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into gpio/for-next
Tag for the device_is_big_endian() addition to property.h
For others to be able to pull from in a stable way.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hrtimer.h')
| -rw-r--r-- | include/linux/hrtimer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 0ee140176f10..f2044d5a652b 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -531,9 +531,9 @@ extern void sysrq_timer_list_show(void); int hrtimers_prepare_cpu(unsigned int cpu); #ifdef CONFIG_HOTPLUG_CPU -int hrtimers_dead_cpu(unsigned int cpu); +int hrtimers_cpu_dying(unsigned int cpu); #else -#define hrtimers_dead_cpu NULL +#define hrtimers_cpu_dying NULL #endif #endif |