diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-11-28 17:32:24 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-11-28 17:32:24 +0300 |
| commit | 26b9a880d24cf94342ae2b259e2a220338559789 (patch) | |
| tree | 3f8dfcd217984dc884e4d532fe310def25494f09 /include/linux/hrtimer.h | |
| parent | 0d3abd456be45369235dd75793ce26f07900044c (diff) | |
| parent | a13fee31f56449fc600d9e064c7b32302f92dcef (diff) | |
| download | linux-26b9a880d24cf94342ae2b259e2a220338559789.tar.xz | |
Merge drm/drm-next into drm-misc-next
Backmerging to get commit 8d6ef26501b9 ("drm/ast: Disconnect BMC if
physical connector is connected") into drm-misc-next.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
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 |