Skip to content

Add conditional compilation for changes with timer symbols in kernel … #358

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add conditional compilation for changes with timer symbols in kernel … #358

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
8 changes: 7 additions & 1 deletion QDMA/linux-kernel/driver/libqdma/qdma_mbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,11 @@ static int mbox_rcv_one_msg(struct qdma_mbox *mbox)

static inline void mbox_timer_stop(struct qdma_mbox *mbox)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 16, 0)
Copy link

@anbe42 anbe42 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal of del_timer() already happened in v6.15.

torvalds/linux@8fa7292

del_timer(&mbox->timer);
#else
timer_delete_sync(&mbox->timer);
Copy link

@anbe42 anbe42 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default replacement for del_timer() is timer_delete() (not the _sync variant).

#endif
}

static inline void mbox_timer_start(struct qdma_mbox *mbox)
Expand Down Expand Up @@ -432,7 +436,9 @@ static void mbox_timer_handler(struct timer_list *t)
static void mbox_timer_handler(unsigned long arg)
#endif
{
#if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
#if LINUX_VERSION_CODE > KERNEL_VERSION(6, 16, 0)
struct qdma_mbox *mbox = timer_container_of(mbox, t, timer);
#elif KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
struct qdma_mbox *mbox = from_timer(mbox, t, timer);
#else
struct qdma_mbox *mbox = (struct qdma_mbox *)arg;
Expand Down