diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2021-12-22 14:26:02 -0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:05 +0200 |
| commit | d989124c02bf5662ccf638d361229bd5ea7bcd93 (patch) | |
| tree | b175c0824593fb449bffe5a5935c46c97503f4bd /package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch | |
| parent | d8f8c78d967c4c0b83e3ff045a4340932af38e4e (diff) | |
| download | upstream-d989124c02bf5662ccf638d361229bd5ea7bcd93.tar.gz upstream-d989124c02bf5662ccf638d361229bd5ea7bcd93.tar.bz2 upstream-d989124c02bf5662ccf638d361229bd5ea7bcd93.zip | |
broadcom-wl: Fix compilation with kernel 5.10
This adds a few fixes for compiling against Linux 5.10:
1. segment_eq() has been removed with upstream commit
428e2976a5bf7e7f5554286d7a5a33b8147b106a ("uaccess: remove
segment_eq") and can use uaccess_kernel() instead
2. ioremap_nocache() is removed and is now an alias for ioremap() with
upstream commit 4bdc0d676a643140bdf17dbf7eafedee3d496a3c ("remove
ioremap_nocache and devm_ioremap_nocache")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit cd3de51bb4a18f922a961fdeb42c1c8f1f80b425)
Diffstat (limited to 'package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch')
| -rw-r--r-- | package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch b/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch index daf3160952..66eba968cf 100644 --- a/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch +++ b/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch @@ -1,6 +1,6 @@ --- a/driver/wl_linux.c +++ b/driver/wl_linux.c -@@ -235,7 +235,11 @@ +@@ -235,7 +235,11 @@ struct wl_info { }; @@ -12,7 +12,7 @@ static void _wl_timer(wl_timer_t *t); #ifdef WLC_HIGH_ONLY -@@ -2512,6 +2517,18 @@ +@@ -2512,6 +2516,18 @@ wl_timer_task(wl_task_t *task) } #endif /* WLC_HIGH_ONLY */ @@ -31,7 +31,7 @@ static void wl_timer(ulong data) { -@@ -2522,6 +2539,7 @@ +@@ -2522,6 +2538,7 @@ wl_timer(ulong data) wl_schedule_task(t->wl, wl_timer_task, t); #endif /* WLC_HIGH_ONLY */ } @@ -39,7 +39,7 @@ static void _wl_timer(wl_timer_t *t) -@@ -2573,9 +2591,13 @@ +@@ -2573,9 +2590,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)( bzero(t, sizeof(wl_timer_t)); |