diff options
Diffstat (limited to 'debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch')
| -rw-r--r-- | debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch b/debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch index 998662451..2733ceeee 100644 --- a/debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch +++ b/debian/patches-rt/0036-mips-mm-highmem-Switch-to-generic-kmap-atomic.patch @@ -1,8 +1,8 @@ -From 5ff7160041ca1461c70a70237f3c6a4b09d54472 Mon Sep 17 00:00:00 2001 +From 4b7084ee83429925ffc66523229bbe655dd93168 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 3 Nov 2020 10:27:25 +0100 Subject: [PATCH 036/323] mips/mm/highmem: Switch to generic kmap atomic -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz No reason having the same code in every architecture @@ -21,10 +21,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> delete mode 100644 arch/mips/include/asm/kmap_types.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 18ebacf29889..0e02b2e6ee06 100644 +index 57839f63074f7..b725f4799a398 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -2733,6 +2733,7 @@ config WAR_MIPS34K_MISSED_ITLB +@@ -2731,6 +2731,7 @@ config WAR_MIPS34K_MISSED_ITLB config HIGHMEM bool "High Memory Support" depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA @@ -33,7 +33,7 @@ index 18ebacf29889..0e02b2e6ee06 100644 config CPU_SUPPORTS_HIGHMEM bool diff --git a/arch/mips/include/asm/fixmap.h b/arch/mips/include/asm/fixmap.h -index 743535be7528..beea14761cef 100644 +index 743535be7528c..beea14761cef0 100644 --- a/arch/mips/include/asm/fixmap.h +++ b/arch/mips/include/asm/fixmap.h @@ -17,7 +17,7 @@ @@ -55,7 +55,7 @@ index 743535be7528..beea14761cef 100644 __end_of_fixed_addresses }; diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h -index 9f021cf51aa7..1716181ea66d 100644 +index 9f021cf51aa71..1716181ea66dd 100644 --- a/arch/mips/include/asm/highmem.h +++ b/arch/mips/include/asm/highmem.h @@ -24,7 +24,7 @@ @@ -83,7 +83,7 @@ index 9f021cf51aa7..1716181ea66d 100644 diff --git a/arch/mips/include/asm/kmap_types.h b/arch/mips/include/asm/kmap_types.h deleted file mode 100644 -index 16665dc2431b..000000000000 +index 16665dc2431b6..0000000000000 --- a/arch/mips/include/asm/kmap_types.h +++ /dev/null @@ -1,13 +0,0 @@ @@ -101,7 +101,7 @@ index 16665dc2431b..000000000000 - -#endif diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c -index 5fec7f45d79a..57e2f08f00d0 100644 +index 5fec7f45d79a8..57e2f08f00d0c 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c @@ -8,8 +8,6 @@ @@ -193,7 +193,7 @@ index 5fec7f45d79a..57e2f08f00d0 100644 - kmap_pte = virt_to_kpte(kmap_vstart); -} diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c -index 07e84a774938..bc80893e5c0f 100644 +index 32e7b869a2910..f0fcf36dd70b9 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -36,7 +36,6 @@ @@ -215,5 +215,5 @@ index 07e84a774938..bc80893e5c0f 100644 max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN; #endif -- -2.43.0 +2.44.0 |