diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-10-30 12:58:55 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-10-31 09:18:43 +0100 |
| commit | e70772311d0c055ef59f799e9ca3497c37b4464f (patch) | |
| tree | c0dd296785232240689825c95402dff29595a989 | |
| parent | cdc2937edd805026736300072bff78731f71374f (diff) | |
| download | upstream-e70772311d0c055ef59f799e9ca3497c37b4464f.tar.gz upstream-e70772311d0c055ef59f799e9ca3497c37b4464f.tar.bz2 upstream-e70772311d0c055ef59f799e9ca3497c37b4464f.zip | |
kernel: bump 4.14 to 4.14.151
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 01504f583e..89e06f89cb 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .198 -LINUX_VERSION-4.14 = .150 +LINUX_VERSION-4.14 = .151 LINUX_KERNEL_HASH-4.9.198 = 9572ebfa6ba0efcf9f1ec7b62c7b89baa36a621ab9fd4c5ad025196c549605ac -LINUX_KERNEL_HASH-4.14.150 = 65c5a4b86b858ba58642f46ae8c983990376d1946e59cc7e054e85b1b7eb57b0 +LINUX_KERNEL_HASH-4.14.151 = ff519c428ee9bbb513a84db5ec32a7e3705cd8c23a57104b25b944cb79583fae remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch index 8dc8664c92..e015610269 100644 --- a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch @@ -458,7 +458,7 @@ /* --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -976,6 +976,9 @@ void build_get_pgde32(u32 **p, unsigned +@@ -983,6 +983,9 @@ void build_get_pgde32(u32 **p, unsigned uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT); uasm_i_addu(p, ptr, tmp, ptr); #else @@ -468,7 +468,7 @@ UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ -@@ -1337,6 +1340,9 @@ static void build_r4000_tlb_refill_handl +@@ -1344,6 +1347,9 @@ static void build_r4000_tlb_refill_handl #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else @@ -478,7 +478,7 @@ build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ #endif -@@ -1348,6 +1354,9 @@ static void build_r4000_tlb_refill_handl +@@ -1355,6 +1361,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); @@ -488,7 +488,7 @@ uasm_i_eret(&p); /* return from trap */ } #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT -@@ -2057,6 +2066,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -2064,6 +2073,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 @@ -498,7 +498,7 @@ build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */ #endif -@@ -2103,6 +2115,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -2110,6 +2122,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); |