aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-18 15:04:42 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:15:17 +0200
commitda5bd73d702e7cb9f7da174977b606ca12ffd96b (patch)
tree1715c989867438940d49fbb0d5a0fa479f5e3fe5 /target/linux/generic/pending-4.14
parent6e243c23530189f0ef252c921aa953d05f048c4d (diff)
downloadupstream-da5bd73d702e7cb9f7da174977b606ca12ffd96b.tar.gz
upstream-da5bd73d702e7cb9f7da174977b606ca12ffd96b.tar.bz2
upstream-da5bd73d702e7cb9f7da174977b606ca12ffd96b.zip
kernel: bump 4.14 to 4.14.112
Refreshed all patches. New symbol: - CONFIG_LDISC_AUTOLOAD Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14')
-rw-r--r--target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch11
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch b/target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
index 9e97f8af2d..1990e87055 100644
--- a/target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
+++ b/target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
@@ -66,11 +66,9 @@ Changes since v1:
drivers/irqchip/irq-ath79-misc.c | 11 +++++++++++
2 files changed, 11 insertions(+), 6 deletions(-)
-diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
-index 4a70c5d..25a5789 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
-@@ -210,12 +210,6 @@ const char *get_system_type(void)
+@@ -183,12 +183,6 @@ const char *get_system_type(void)
return ath79_sys_type;
}
@@ -83,8 +81,6 @@ index 4a70c5d..25a5789 100644
unsigned int get_c0_compare_int(void)
{
return CP0_LEGACY_COMPARE_IRQ;
-diff --git a/drivers/irqchip/irq-ath79-misc.c b/drivers/irqchip/irq-ath79-misc.c
-index aa72907..0390603 100644
--- a/drivers/irqchip/irq-ath79-misc.c
+++ b/drivers/irqchip/irq-ath79-misc.c
@@ -22,6 +22,15 @@
@@ -103,7 +99,7 @@ index aa72907..0390603 100644
static void ath79_misc_irq_handler(struct irq_desc *desc)
{
-@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init(
+@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domai
{
void __iomem *base = domain->host_data;
@@ -112,6 +108,3 @@ index aa72907..0390603 100644
/* Disable and clear all interrupts */
__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);
__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);
---
-1.9.1
-