kernel.h: Add wrapper for renamed from_timer function for rhel 8.9#106
Open
phoneben wants to merge 1 commit intoasterisk:masterfrom
Open
kernel.h: Add wrapper for renamed from_timer function for rhel 8.9#106phoneben wants to merge 1 commit intoasterisk:masterfrom
phoneben wants to merge 1 commit intoasterisk:masterfrom
Conversation
InterLinked1
suggested changes
Mar 4, 2026
include/dahdi/kernel.h
Outdated
| #include <linux/poll.h> | ||
|
|
||
| #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) | ||
| #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))) |
Contributor
There was a problem hiding this comment.
Need spaces before and after ||
Contributor
Author
There was a problem hiding this comment.
look this is good for me centos 9 will it brake for other rhel users ?
is there a better way maybe ?
#if !defined(from_timer) && defined(timer_container_of)
#define from_timer timer_container_of
#endif
InterLinked1
reviewed
Mar 4, 2026
Contributor
InterLinked1
left a comment
InterLinked1
left a comment
There was a problem hiding this comment.
Are you sure this won't cause issues if RHEL_RELEASE_CODE and RHEL_RELEASE_VERSION are not both defined (only one is)? I seem to recall that being an issue before - see ce694ac
InterLinked1
approved these changes
Mar 4, 2026
Contributor
InterLinked1
left a comment
InterLinked1
left a comment
There was a problem hiding this comment.
Looks good... though at some point down the line, we should probably clean up and simplify some of the RHEL macros for consistency
InterLinked1
suggested changes
Mar 4, 2026
drivers/dahdi/xpp/xbus-sysfs.c
Outdated
| #endif | ||
|
|
||
| #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))) | ||
| #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8))) |
Contributor
There was a problem hiding this comment.
Space after || in these
phoneben
force-pushed
the
from_timer
branch
2 times, most recently
from
897f65f to
538b1c3
Compare
kernel.h: Add wrapper for renamed from_timer function for rhel 8.9 see original issue asterisk#95 Introduce `RHEL_VERSION_GE()` helper to simplify and standardize RHEL version checks. Future checks can use `RHEL_VERSION_GE(x, y)` instead of repeating the full macro guard.
Contributor
Author
|
is this good ? |
InterLinked1
approved these changes
Mar 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
kernel.h: Add wrapper for renamed from_timer function for rhel 8.9
see original issue #95
Introduce
RHEL_VERSION_GE()helper to simplify and standardize RHEL version checks.Future checks can use
RHEL_VERSION_GE(x, y)instead of repeating the full macro guard.