summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0048-mm-highmem-Provide-kmap_local.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/0048-mm-highmem-Provide-kmap_local.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 '')
-rw-r--r--debian/patches-rt/0048-mm-highmem-Provide-kmap_local.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0048-mm-highmem-Provide-kmap_local.patch b/debian/patches-rt/0048-mm-highmem-Provide-kmap_local.patch
index aa15ab4ec..6da17988e 100644
--- a/debian/patches-rt/0048-mm-highmem-Provide-kmap_local.patch
+++ b/debian/patches-rt/0048-mm-highmem-Provide-kmap_local.patch
@@ -1,8 +1,8 @@
-From 452c4c8536ea017ed0f82287834e7cfa2f751488 Mon Sep 17 00:00:00 2001
+From 6a7f5fb7836ec39356bb78e261f3e3a8cf173e26 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Nov 2020 10:27:37 +0100
Subject: [PATCH 048/323] mm/highmem: Provide kmap_local*
-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
Now that the kmap atomic index is stored in task struct provide a
preemptible variant. On context switch the maps of an outgoing task are
@@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h
-index c5a22177db85..1bbe96dc8be6 100644
+index c5a22177db85b..1bbe96dc8be65 100644
--- a/include/linux/highmem-internal.h
+++ b/include/linux/highmem-internal.h
@@ -68,6 +68,26 @@ static inline void kmap_flush_unused(void)
@@ -99,7 +99,7 @@ index c5a22177db85..1bbe96dc8be6 100644
+
#endif
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 5c888525b4c5..7a3c6d4b79d8 100644
+index 5c888525b4c58..7a3c6d4b79d82 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -60,24 +60,22 @@ static inline struct page *kmap_to_page(void *addr);
@@ -179,7 +179,7 @@ index 5c888525b4c5..7a3c6d4b79d8 100644
/* Highmem related interfaces for management code */
diff --git a/mm/highmem.c b/mm/highmem.c
-index d7a1c80001d0..8db577e5290c 100644
+index d7a1c80001d02..8db577e5290cc 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -450,6 +450,11 @@ void *__kmap_local_pfn_prot(unsigned long pfn, pgprot_t prot)
@@ -203,5 +203,5 @@ index d7a1c80001d0..8db577e5290c 100644
EXPORT_SYMBOL(kunmap_local_indexed);
--
-2.43.0
+2.44.0