Page MenuHomeFreeBSD
Files F171979590

D59688.id186744.diff
No OneTemporary
Actions

D59688.id186744.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h
--- a/sys/compat/linuxkpi/common/include/linux/timer.h
+++ b/sys/compat/linuxkpi/common/include/linux/timer.h
@@ -37,11 +37,7 @@
struct timer_list {
struct callout callout;
- union {
- void (*function) (unsigned long); /* < v4.15 */
- void (*function_415) (struct timer_list *);
- };
- unsigned long data;
+ void (*function) (struct timer_list *);
unsigned long expires;
};
@@ -59,15 +55,14 @@
#define timer_setup(timer, func, flags) do { \
CTASSERT(((flags) & ~TIMER_IRQSAFE) == 0); \
- (timer)->function_415 = (func); \
- (timer)->data = (unsigned long)(timer); \
+ (timer)->function = (func); \
callout_init(&(timer)->callout, 1); \
} while (0)
+#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION < 41500)
#define setup_timer(timer, func, dat) do { \
(timer)->function = (func); \
- (timer)->data = (dat); \
- callout_init(&(timer)->callout, 1); \
+ callout_init(&(timer)->callout, 1); \
} while (0)
#define __setup_timer(timer, func, dat, flags) do { \
@@ -77,9 +72,9 @@
#define init_timer(timer) do { \
(timer)->function = NULL; \
- (timer)->data = 0; \
- callout_init(&(timer)->callout, 1); \
+ callout_init(&(timer)->callout, 1); \
} while (0)
+#endif
extern int mod_timer(struct timer_list *, unsigned long);
extern void add_timer(struct timer_list *);
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -2147,7 +2147,7 @@
return;
}
- timer->function(timer->data);
+ timer->function(timer);
}
static int

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 16, 2:46 AM (10 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38994124
Default Alt Text
D59688.id186744.diff (1 KB)

Event Timeline