diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-12-10 21:07:54 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-12-10 21:07:54 +0300 |
| commit | cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65 (patch) | |
| tree | 307e1e7bd42f3b451182f3a548f2169aef3c6ddf /include/linux/hrtimer.h | |
| parent | a08935fc859b22884dcb6b5126d3a986467101ce (diff) | |
| parent | fca9448ae2f5ddebd841c727ee86136e1b5cbd86 (diff) | |
| download | linux-cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65.tar.xz | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Backmerge drm-misc-next to pick up some dependencies for drm/msm
patches, in particular:
https://patchwork.freedesktop.org/patch/570219/?series=127251&rev=1
https://patchwork.freedesktop.org/series/123411/
Signed-off-by: Rob Clark <robdclark@chromium.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 |