072937888e
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait:
Provide infrastructure to deal with nested blocking") from 3.19, causing
the following error on load:
[ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel)
Fix this by guarding it with a check for 3.18.11 or earlier instead of
3.19.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45710
35 lines
1 KiB
Diff
35 lines
1 KiB
Diff
From: Oleksij Rempel <linux@rempel-privat.de>
|
|
Date: Sun, 22 Mar 2015 19:29:50 +0100
|
|
Subject: [PATCH] ath9k: add multi_read to be compatible with ath9k_htc
|
|
|
|
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -141,6 +141,16 @@ static unsigned int ath9k_ioread32(void
|
|
return val;
|
|
}
|
|
|
|
+static void ath9k_multi_ioread32(void *hw_priv, u32 *addr,
|
|
+ u32 *val, u16 count)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < count; i++)
|
|
+ val[i] = ath9k_ioread32(hw_priv, addr[i]);
|
|
+}
|
|
+
|
|
+
|
|
static unsigned int __ath9k_reg_rmw(struct ath_softc *sc, u32 reg_offset,
|
|
u32 set, u32 clr)
|
|
{
|
|
@@ -530,6 +540,7 @@ static int ath9k_init_softc(u16 devid, s
|
|
ah->hw = sc->hw;
|
|
ah->hw_version.devid = devid;
|
|
ah->reg_ops.read = ath9k_ioread32;
|
|
+ ah->reg_ops.multi_read = ath9k_multi_ioread32;
|
|
ah->reg_ops.write = ath9k_iowrite32;
|
|
ah->reg_ops.rmw = ath9k_reg_rmw;
|
|
pCap = &ah->caps;
|