Skip to content

Commit

Permalink
kernel: update kernel 4.4 to 4.4.61
Browse files Browse the repository at this point in the history
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  • Loading branch information
jow- committed Apr 15, 2017
1 parent c2999ef commit 6ca5ccc
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 117 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
Expand Up @@ -3,10 +3,10 @@
LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .43
LINUX_VERSION-4.4 = .59
LINUX_VERSION-4.4 = .61

LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
LINUX_KERNEL_HASH-4.4.59 = 64e9523c4c7fdaf391a16dd19541bb58e39943cb2151aa0c3d15b6aeaba996ca
LINUX_KERNEL_HASH-4.4.61 = 30dee7164615ad8184eba4ea6f4906b3ceb2fe462a8a4a929c8e9aab8d4a31da

ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
Expand Down
10 changes: 5 additions & 5 deletions target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch
Expand Up @@ -416,7 +416,7 @@
/*
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -943,6 +943,9 @@ build_get_pgde32(u32 **p, unsigned int t
@@ -960,6 +960,9 @@ build_get_pgde32(u32 **p, unsigned int t
uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT);
uasm_i_addu(p, ptr, tmp, ptr);
#else
Expand All @@ -426,7 +426,7 @@
UASM_i_LA_mostly(p, ptr, pgdc);
#endif
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
@@ -1284,6 +1287,9 @@ static void build_r4000_tlb_refill_handl
@@ -1301,6 +1304,9 @@ static void build_r4000_tlb_refill_handl
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
Expand All @@ -436,7 +436,7 @@
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
#endif

@@ -1295,6 +1301,9 @@ static void build_r4000_tlb_refill_handl
@@ -1312,6 +1318,9 @@ static void build_r4000_tlb_refill_handl
build_update_entries(&p, K0, K1);
build_tlb_write_entry(&p, &l, &r, tlb_random);
uasm_l_leave(&l, p);
Expand All @@ -446,7 +446,7 @@
uasm_i_eret(&p); /* return from trap */
}
#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
@@ -1871,6 +1880,9 @@ build_r4000_tlbchange_handler_head(u32 *
@@ -1888,6 +1897,9 @@ build_r4000_tlbchange_handler_head(u32 *
#ifdef CONFIG_64BIT
build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */
#else
Expand All @@ -456,7 +456,7 @@
build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
#endif

@@ -1917,6 +1929,9 @@ build_r4000_tlbchange_handler_tail(u32 *
@@ -1934,6 +1946,9 @@ build_r4000_tlbchange_handler_tail(u32 *
build_tlb_write_entry(p, l, r, tlb_indexed);
uasm_l_leave(l, *p);
build_restore_work_registers(p);
Expand Down
4 changes: 2 additions & 2 deletions target/linux/lantiq/patches-4.4/0047-irq-fixes.patch
Expand Up @@ -45,7 +45,7 @@
/* disable */
ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~BIT(i),
LTQ_EIU_EXIN_INEN);
@@ -343,10 +343,10 @@ static int icu_map(struct irq_domain *d,
@@ -344,10 +344,10 @@ static int icu_map(struct irq_domain *d,
return 0;

for (i = 0; i < exin_avail; i++)
Expand All @@ -58,7 +58,7 @@

return 0;
}
@@ -441,14 +441,14 @@ int __init icu_of_init(struct device_nod
@@ -437,14 +437,14 @@ int __init icu_of_init(struct device_nod
eiu_node = of_find_compatible_node(NULL, NULL, "lantiq,eiu-xway");
if (eiu_node && !of_address_to_resource(eiu_node, 0, &res)) {
/* find out how many external irq sources we have */
Expand Down

This file was deleted.

21 changes: 0 additions & 21 deletions target/linux/ramips/patches-4.4/200-rt3883-fix-pinctrl-typo.patch

This file was deleted.

0 comments on commit 6ca5ccc

Please sign in to comment.