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/0037-nds32-mm-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/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch')
-rw-r--r-- | debian/patches-rt/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch b/debian/patches-rt/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch index 08d1dc198..f077ae32f 100644 --- a/debian/patches-rt/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch +++ b/debian/patches-rt/0037-nds32-mm-highmem-Switch-to-generic-kmap-atomic.patch @@ -1,8 +1,8 @@ -From bc36ab505c69bbf7d37b57cb983ca97b198c44df Mon Sep 17 00:00:00 2001 +From a7653826d1027195159b44c0adb9ce9b5493d9fd Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 3 Nov 2020 10:27:26 +0100 Subject: [PATCH 037/323] nds32/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 The mapping code is odd and looks broken. See FIXME in the comment. @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> delete mode 100644 arch/nds32/mm/highmem.c diff --git a/arch/nds32/Kconfig.cpu b/arch/nds32/Kconfig.cpu -index f88a12fdf0f3..c10759952485 100644 +index f88a12fdf0f35..c107599524855 100644 --- a/arch/nds32/Kconfig.cpu +++ b/arch/nds32/Kconfig.cpu @@ -157,6 +157,7 @@ config HW_SUPPORT_UNALIGNMENT_ACCESS @@ -35,7 +35,7 @@ index f88a12fdf0f3..c10759952485 100644 The address space of Andes processors is only 4 Gigabytes large and it has to accommodate user address space, kernel address diff --git a/arch/nds32/include/asm/fixmap.h b/arch/nds32/include/asm/fixmap.h -index 5a4bf11e5800..2fa09a2de428 100644 +index 5a4bf11e58003..2fa09a2de4281 100644 --- a/arch/nds32/include/asm/fixmap.h +++ b/arch/nds32/include/asm/fixmap.h @@ -6,7 +6,7 @@ @@ -57,7 +57,7 @@ index 5a4bf11e5800..2fa09a2de428 100644 FIX_EARLYCON_MEM_BASE, __end_of_fixed_addresses diff --git a/arch/nds32/include/asm/highmem.h b/arch/nds32/include/asm/highmem.h -index fe986d0e6e3f..16159a8716f2 100644 +index fe986d0e6e3ff..16159a8716f22 100644 --- a/arch/nds32/include/asm/highmem.h +++ b/arch/nds32/include/asm/highmem.h @@ -5,7 +5,6 @@ @@ -97,7 +97,7 @@ index fe986d0e6e3f..16159a8716f2 100644 #endif diff --git a/arch/nds32/mm/Makefile b/arch/nds32/mm/Makefile -index 897ecaf5cf54..14fb2e8eb036 100644 +index 897ecaf5cf54b..14fb2e8eb0368 100644 --- a/arch/nds32/mm/Makefile +++ b/arch/nds32/mm/Makefile @@ -3,7 +3,6 @@ obj-y := extable.o tlb.o fault.o init.o mmap.o \ @@ -110,7 +110,7 @@ index 897ecaf5cf54..14fb2e8eb036 100644 CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE) diff --git a/arch/nds32/mm/highmem.c b/arch/nds32/mm/highmem.c deleted file mode 100644 -index 4284cd59e21a..000000000000 +index 4284cd59e21ad..0000000000000 --- a/arch/nds32/mm/highmem.c +++ /dev/null @@ -1,48 +0,0 @@ @@ -163,5 +163,5 @@ index 4284cd59e21a..000000000000 -} -EXPORT_SYMBOL(kunmap_atomic_high); -- -2.43.0 +2.44.0 |