From 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 19:45:38 +0200 Subject: Merging debian version 5.10.216-1. Signed-off-by: Daniel Baumann --- ...-mm-highmem-Use-generic-kmap-atomic-implementatio.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'debian/patches-rt/0032-arc-mm-highmem-Use-generic-kmap-atomic-implementatio.patch') diff --git a/debian/patches-rt/0032-arc-mm-highmem-Use-generic-kmap-atomic-implementatio.patch b/debian/patches-rt/0032-arc-mm-highmem-Use-generic-kmap-atomic-implementatio.patch index 581f1da69..455a72539 100644 --- a/debian/patches-rt/0032-arc-mm-highmem-Use-generic-kmap-atomic-implementatio.patch +++ b/debian/patches-rt/0032-arc-mm-highmem-Use-generic-kmap-atomic-implementatio.patch @@ -1,9 +1,9 @@ -From 7eeaddc0ba0792dd0d8a1f5f167ff44230b77855 Mon Sep 17 00:00:00 2001 +From a971420d2c9f51a81d50f4b89aed96c9300f322f Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 3 Nov 2020 10:27:21 +0100 Subject: [PATCH 032/323] arc/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 Adopt the map ordering to match the other architectures and the generic code. Also make the maximum entries limited and not dependend on the number @@ -43,7 +43,7 @@ Signed-off-by: Sebastian Andrzej Siewior delete mode 100644 arch/arc/include/asm/kmap_types.h diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig -index 0a89cc9def65..d8804001d550 100644 +index 0a89cc9def651..d8804001d5507 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -507,6 +507,7 @@ config LINUX_RAM_BASE @@ -55,7 +55,7 @@ index 0a89cc9def65..d8804001d550 100644 With ARC 2G:2G address split, only upper 2G is directly addressable by kernel. Enable this to potentially allow access to rest of 2G and PAE diff --git a/arch/arc/include/asm/highmem.h b/arch/arc/include/asm/highmem.h -index 6e5eafb3afdd..a6b8e2c352c4 100644 +index 6e5eafb3afdd4..a6b8e2c352c44 100644 --- a/arch/arc/include/asm/highmem.h +++ b/arch/arc/include/asm/highmem.h @@ -9,17 +9,29 @@ @@ -110,7 +110,7 @@ index 6e5eafb3afdd..a6b8e2c352c4 100644 #endif diff --git a/arch/arc/include/asm/kmap_types.h b/arch/arc/include/asm/kmap_types.h deleted file mode 100644 -index fecf7851ec32..000000000000 +index fecf7851ec322..0000000000000 --- a/arch/arc/include/asm/kmap_types.h +++ /dev/null @@ -1,14 +0,0 @@ @@ -129,7 +129,7 @@ index fecf7851ec32..000000000000 - */ -#endif diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c -index 1b9f473c6369..c79912a6b196 100644 +index 1b9f473c63693..c79912a6b1961 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c @@ -36,9 +36,8 @@ @@ -208,5 +208,5 @@ index 1b9f473c6369..c79912a6b196 100644 + alloc_kmap_pgtable(FIXMAP_BASE); } -- -2.43.0 +2.44.0 -- cgit v1.2.3