Skip to content

Commit 092011d

Browse files
committed
scst/include/backport.h: Unbreak the Ubuntu 22.04 build
1 parent b2a1f6e commit 092011d

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

scst/include/backport.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222

2323
#include <linux/version.h>
24+
#include <generated/utsrelease.h>
2425
#ifndef RHEL_RELEASE_VERSION
2526
#define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
2627
#endif
@@ -1749,7 +1750,12 @@ static inline int timer_delete_sync(struct timer_list *timer)
17491750
LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 91)) && \
17501751
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 || \
17511752
RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 9 || \
1752-
RHEL_MAJOR -0 == 9 && RHEL_MINOR -0 < 3)
1753+
RHEL_MAJOR -0 == 9 && RHEL_MINOR -0 < 3) && \
1754+
(!defined(UTS_UBUNTU_RELEASE_ABI) || \
1755+
(LINUX_VERSION_CODE == KERNEL_VERSION(5, 15, 0) && \
1756+
UTS_UBUNTU_RELEASE_ABI -0 >= 93) || \
1757+
(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 0) && \
1758+
UTS_UBUNTU_RELEASE_ABI -0 >= 93))
17531759
/*
17541760
* See also commit bb663f0f3c39 ("timers: Rename del_timer() to timer_delete()") # v6.2.
17551761
* See also commit b086d1e82fcd # v6.1.91.

0 commit comments

Comments
 (0)