kernel: update kernel 4.4 to version 4.4.49
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
236840eb47
commit
a11243578a
4 changed files with 6 additions and 49 deletions
|
@ -3,11 +3,11 @@
|
|||
LINUX_RELEASE?=1
|
||||
|
||||
LINUX_VERSION-3.18 = .43
|
||||
LINUX_VERSION-4.4 = .47
|
||||
LINUX_VERSION-4.4 = .49
|
||||
LINUX_VERSION-4.9 = .10
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
|
||||
LINUX_KERNEL_HASH-4.4.47 = ce0ac0016f37ba3e9bc8ad3765933b61c4072fcfe4c44804fc7b308cd7f94de7
|
||||
LINUX_KERNEL_HASH-4.4.49 = ee33428a45facacde29d1fc36f70b977f9f5471a87dc18059e04d0f7871ab6b1
|
||||
LINUX_KERNEL_HASH-4.9.10 = bd6e05476fd8d9ea4945e11598d87bc97806bbc8d03556abbaaf809707661525
|
||||
|
||||
ifdef KERNEL_PATCHVER
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
From patchwork Tue Feb 7 17:44:58 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: ARC: [arcompact] brown paper bag bug in unaligned access delay slot
|
||||
fixup
|
||||
From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
|
||||
X-Patchwork-Id: 725238
|
||||
Message-Id: <1486489498-9221-1-git-send-email-vgupta@synopsys.com>
|
||||
To: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>,
|
||||
linux-snps-arc@lists.infradead.org, Jo-Philipp Wich <jo@mein.io>,
|
||||
linux-kernel@vger.kernel.org, stable@vger.kernel.org
|
||||
Date: Tue, 7 Feb 2017 09:44:58 -0800
|
||||
|
||||
Reported-by: Jo-Philipp Wich <jo@mein.io>
|
||||
Fixes: 9aed02feae57bf7 ("ARC: [arcompact] handle unaligned access delay slot")
|
||||
Cc: linux-kernel@vger.kernel.org
|
||||
Cc: linux-snps-arc@lists.infradead.org
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
|
||||
---
|
||||
arch/arc/kernel/unaligned.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c
|
||||
index 91ebe382147f..5f69c3bd59bb 100644
|
||||
--- a/arch/arc/kernel/unaligned.c
|
||||
+++ b/arch/arc/kernel/unaligned.c
|
||||
@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
|
||||
|
||||
/* clear any remanants of delay slot */
|
||||
if (delay_mode(regs)) {
|
||||
- regs->ret = regs->bta ~1U;
|
||||
+ regs->ret = regs->bta & ~1U;
|
||||
regs->status32 &= ~STATUS_DE_MASK;
|
||||
} else {
|
||||
regs->ret += state.instr_len;
|
|
@ -223,7 +223,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|||
}
|
||||
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
@@ -649,6 +649,7 @@ struct bcma_drv_cc {
|
||||
@@ -646,6 +646,7 @@ struct bcma_drv_cc {
|
||||
spinlock_t gpio_lock;
|
||||
#ifdef CONFIG_BCMA_DRIVER_GPIO
|
||||
struct gpio_chip gpio;
|
||||
|
|
|
@ -10,11 +10,9 @@ Signed-off-by: Shaohui Xie <Shaohui.Xie@nxp.com>
|
|||
drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
|
||||
index aaedaae..c092afb 100644
|
||||
--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
|
||||
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
|
||||
@@ -409,6 +409,10 @@ void get_pause_cfg(struct mac_device *mac_dev, bool *rx_pause, bool *tx_pause)
|
||||
@@ -409,6 +409,10 @@ void get_pause_cfg(struct mac_device *ma
|
||||
}
|
||||
EXPORT_SYMBOL(get_pause_cfg);
|
||||
|
||||
|
@ -25,7 +23,7 @@ index aaedaae..c092afb 100644
|
|||
static void adjust_link(struct net_device *net_dev)
|
||||
{
|
||||
struct dpa_priv_s *priv = netdev_priv(net_dev);
|
||||
@@ -473,7 +477,7 @@ static int xgmac_init_phy(struct net_device *net_dev,
|
||||
@@ -473,7 +477,7 @@ static int xgmac_init_phy(struct net_dev
|
||||
mac_dev->phy_if);
|
||||
else
|
||||
phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
|
||||
|
@ -34,7 +32,7 @@ index aaedaae..c092afb 100644
|
|||
if (unlikely(phy_dev == NULL) || IS_ERR(phy_dev)) {
|
||||
netdev_err(net_dev, "Could not attach to PHY %s\n",
|
||||
mac_dev->phy_node ?
|
||||
@@ -506,7 +510,7 @@ static int memac_init_phy(struct net_device *net_dev,
|
||||
@@ -506,7 +510,7 @@ static int memac_init_phy(struct net_dev
|
||||
return 0;
|
||||
} else
|
||||
phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
|
||||
|
@ -43,6 +41,3 @@ index aaedaae..c092afb 100644
|
|||
mac_dev->phy_if);
|
||||
} else {
|
||||
if (!mac_dev->phy_node)
|
||||
--
|
||||
2.1.0.27.g96db324
|
||||
|
||||
|
|
Loading…
Reference in a new issue