Skip to content

uoa: fix build on kernels that renamed from_timer() to timer_container_of() #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pubyun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

uoa: fix build on kernels that renamed from_timer() to timer_container_of() #1066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions kmod/uoa/uoa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@
#define HAVE_PROC_OPS
#endif

/*
* Upstream v6.16 renamed from_timer() to timer_container_of(). RHEL/AlmaLinux
* backport this into 5.14.0-based kernels, so a LINUX_VERSION_CODE check is
* unreliable; detect by macro presence instead.
*/
#if !defined(from_timer) && defined(timer_container_of)
#define from_timer(var, callback_timer, timer_fieldname) \
timer_container_of(var, callback_timer, timer_fieldname)
#endif

#define UOA_NEED_EXTRA
#include "uoa_extra.h"
#include "uoa.h"
Expand Down