aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-08-11 18:13:35 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-11 23:17:31 +0200
commit59dce3b595b0477bef991f6504d28fbd89cc8b4d (patch)
tree69688411d819670b03f30e83c8d5bc2c84ecaf0b /target/linux/ramips
parentf6b6d4b2f0cb3ba12c18d5a89560fb658a954d22 (diff)
downloadupstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.tar.gz
upstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.tar.bz2
upstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.zip
kernel: bump 5.10 to 5.10.189
All patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch4
-rw-r--r--target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
index 2ea727b707..ef45aac61b 100644
--- a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
+++ b/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
@@ -17,7 +17,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
-@@ -543,8 +543,28 @@ static int __init bootcmdline_scan_chose
+@@ -545,8 +545,28 @@ static int __init bootcmdline_scan_chose
#endif /* CONFIG_OF_EARLY_FLATTREE */
@@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
bool dt_bootargs = false;
/*
-@@ -558,6 +578,14 @@ static void __init bootcmdline_init(void
+@@ -560,6 +580,14 @@ static void __init bootcmdline_init(void
}
/*
diff --git a/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch
index 85f3a3067f..0476847c3b 100644
--- a/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch
+++ b/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
-@@ -695,8 +695,6 @@ static void __init arch_mem_init(char **
+@@ -697,8 +697,6 @@ static void __init arch_mem_init(char **
if (crashk_res.start != crashk_res.end)
memblock_reserve(crashk_res.start, resource_size(&crashk_res));
#endif
@@ -19,7 +19,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/*
* In order to reduce the possibility of kernel panic when failed to
* get IO TLB memory under CONFIG_SWIOTLB, it is better to allocate
-@@ -816,6 +814,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -818,6 +816,7 @@ void __init setup_arch(char **cmdline_p)
cpu_cache_init();
paging_init();