diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:36 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:36 +0000 |
commit | 429d3efd5669e129a6168d62edb6832e36b7a2a0 (patch) | |
tree | 14b99403f823ded018ba76aa450e8687247796b8 /debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch | |
parent | Merging upstream version 5.10.216. (diff) | |
download | linux-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/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch')
-rw-r--r-- | debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch b/debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch index 7f4d188e7..6a84bd8a4 100644 --- a/debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch +++ b/debian/patches-rt/0033-ARM-highmem-Switch-to-generic-kmap-atomic.patch @@ -1,8 +1,8 @@ -From 007968641a299ffd9fd631d7f67fc119aaf9ac5d Mon Sep 17 00:00:00 2001 +From c5690ad4aba59626108d65a45b07ce12027d864c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 3 Nov 2020 10:27:22 +0100 Subject: [PATCH 033/323] ARM: 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. @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> delete mode 100644 arch/arm/mm/highmem.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 335308aff6ce..c01251683018 100644 +index 335308aff6ce0..c01251683018d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1497,6 +1497,7 @@ config HAVE_ARCH_PFN_VALID @@ -35,7 +35,7 @@ index 335308aff6ce..c01251683018 100644 The address space of ARM processors is only 4 Gigabytes large and it has to accommodate user address space, kernel address diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h -index 9575b404019c..707068f852c2 100644 +index 9575b404019c9..707068f852c27 100644 --- a/arch/arm/include/asm/fixmap.h +++ b/arch/arm/include/asm/fixmap.h @@ -7,14 +7,14 @@ @@ -56,7 +56,7 @@ index 9575b404019c..707068f852c2 100644 /* Support writing RO kernel text via kprobes, jump labels, etc. */ FIX_TEXT_POKE0, diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h -index 31811be38d78..b22dffa8c7eb 100644 +index 31811be38d781..b22dffa8c7eb9 100644 --- a/arch/arm/include/asm/highmem.h +++ b/arch/arm/include/asm/highmem.h @@ -2,7 +2,8 @@ @@ -113,7 +113,7 @@ index 31811be38d78..b22dffa8c7eb 100644 #endif diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h deleted file mode 100644 -index 5590940ee43d..000000000000 +index 5590940ee43d7..0000000000000 --- a/arch/arm/include/asm/kmap_types.h +++ /dev/null @@ -1,10 +0,0 @@ @@ -128,7 +128,7 @@ index 5590940ee43d..000000000000 - -#endif diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile -index 7cb1699fbfc4..c4ce477c5261 100644 +index 7cb1699fbfc4f..c4ce477c52611 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_MODULES) += proc-syms.o @@ -141,7 +141,7 @@ index 7cb1699fbfc4..c4ce477c5261 100644 diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c deleted file mode 100644 -index 187fab227b50..000000000000 +index 187fab227b509..0000000000000 --- a/arch/arm/mm/highmem.c +++ /dev/null @@ -1,121 +0,0 @@ @@ -267,5 +267,5 @@ index 187fab227b50..000000000000 - return (void *)vaddr; -} -- -2.43.0 +2.44.0 |