summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
commit429d3efd5669e129a6168d62edb6832e36b7a2a0 (patch)
tree14b99403f823ded018ba76aa450e8687247796b8 /debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-429d3efd5669e129a6168d62edb6832e36b7a2a0.tar.xz
linux-429d3efd5669e129a6168d62edb6832e36b7a2a0.zip
Adding debian version 5.10.216-1.debian/5.10.216-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch')
-rw-r--r--debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch b/debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch
index d381e36e5..2565d6f48 100644
--- a/debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch
+++ b/debian/patches-rt/0031-x86-mm-highmem-Use-generic-kmap-atomic-implementatio.patch
@@ -1,9 +1,9 @@
-From a6456b1e46c0a3b8ad0a9dd3afaeb69c037ad289 Mon Sep 17 00:00:00 2001
+From 2da90b707245685363c7adcdef8b86137e6a639b Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Nov 2020 10:27:20 +0100
Subject: [PATCH 031/323] x86/mm/highmem: Use generic kmap atomic
implementation
-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
Convert X86 to the generic kmap atomic implementation and make the
iomap_atomic() naming convention consistent while at it.
@@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
delete mode 100644 arch/x86/include/asm/kmap_types.h
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 6dc670e36393..54e5284a6ae1 100644
+index 9b3fa05e46226..59db07b61c0f8 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -15,6 +15,7 @@ config X86_32
@@ -40,7 +40,7 @@ index 6dc670e36393..54e5284a6ae1 100644
select OLD_SIGACTION
select GENERIC_VDSO_32
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
-index 77217bd292bd..8eba66a33e39 100644
+index 77217bd292bd5..8eba66a33e397 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -31,7 +31,7 @@
@@ -70,7 +70,7 @@ index 77217bd292bd..8eba66a33e39 100644
void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h
-index 0f420b24e0fc..032e020853aa 100644
+index 0f420b24e0fcb..032e020853aa6 100644
--- a/arch/x86/include/asm/highmem.h
+++ b/arch/x86/include/asm/highmem.h
@@ -23,7 +23,6 @@
@@ -103,7 +103,7 @@ index 0f420b24e0fc..032e020853aa 100644
unsigned long end_pfn);
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
-index bacf68c4d70e..0be7a30fd6bc 100644
+index bacf68c4d70e6..0be7a30fd6bc1 100644
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
@@ -9,19 +9,21 @@
@@ -138,7 +138,7 @@ index bacf68c4d70e..0be7a30fd6bc 100644
#endif /* _ASM_X86_IOMAP_H */
diff --git a/arch/x86/include/asm/kmap_types.h b/arch/x86/include/asm/kmap_types.h
deleted file mode 100644
-index 04ab8266e347..000000000000
+index 04ab8266e347c..0000000000000
--- a/arch/x86/include/asm/kmap_types.h
+++ /dev/null
@@ -1,13 +0,0 @@
@@ -156,7 +156,7 @@ index 04ab8266e347..000000000000
-
-#endif /* _ASM_X86_KMAP_TYPES_H */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 903d71884fa2..130f428b0cc8 100644
+index 903d71884fa25..130f428b0cc8d 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -41,7 +41,6 @@
@@ -168,7 +168,7 @@ index 903d71884fa2..130f428b0cc8 100644
#include <asm/nospec-branch.h>
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index 075fe51317b0..2c54b76d8f84 100644
+index 075fe51317b0f..2c54b76d8f849 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -4,65 +4,6 @@
@@ -238,7 +238,7 @@ index 075fe51317b0..2c54b76d8f84 100644
{
struct zone *zone;
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 7c055259de3a..da31c2635ee4 100644
+index 7c055259de3a6..da31c2635ee43 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -394,19 +394,6 @@ kernel_physical_mapping_init(unsigned long start,
@@ -271,7 +271,7 @@ index 7c055259de3a..da31c2635ee4 100644
* NOTE: at this point the bootmem allocator is fully available.
*/
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index f60398aeb644..e0a40d7cc66c 100644
+index f60398aeb6445..e0a40d7cc66c8 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -44,28 +44,7 @@ void iomap_free(resource_size_t base, unsigned long size)
@@ -346,7 +346,7 @@ index f60398aeb644..e0a40d7cc66c 100644
-EXPORT_SYMBOL_GPL(iounmap_atomic);
+EXPORT_SYMBOL_GPL(iomap_atomic_pfn_prot);
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 14d5b4020c8c..fbede783dc34 100644
+index 14d5b4020c8ca..fbede783dc341 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -217,7 +217,7 @@ static inline void __kunmap_atomic(void *addr)
@@ -359,7 +359,7 @@ index 14d5b4020c8c..fbede783dc34 100644
DECLARE_PER_CPU(int, __kmap_atomic_idx);
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
-index c75e4d3d8833..3b0940be72e9 100644
+index c75e4d3d8833f..3b0940be72e96 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -69,7 +69,7 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping,
@@ -372,7 +372,7 @@ index c75e4d3d8833..3b0940be72e9 100644
static inline void
diff --git a/mm/highmem.c b/mm/highmem.c
-index 67d2d5983cb0..77677c6844f7 100644
+index 67d2d5983cb06..77677c6844f73 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -32,7 +32,7 @@
@@ -385,5 +385,5 @@ index 67d2d5983cb0..77677c6844f7 100644
#endif
#endif
--
-2.43.0
+2.44.0