summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:46:06 +0000
commit30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch)
tree968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz
linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch')
-rw-r--r--debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch b/debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch
index 828708904..5b1d99dee 100644
--- a/debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch
+++ b/debian/patches-rt/0029-highmem-Provide-generic-variant-of-kmap_atomic.patch
@@ -1,8 +1,8 @@
-From 4e1b14787f7a2c71a9347db23c402f5dbe2da206 Mon Sep 17 00:00:00 2001
+From 64953b0dd3343f0296a25b10d108692ab140a56c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Nov 2020 10:27:18 +0100
Subject: [PATCH 029/323] highmem: Provide generic variant of 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 kmap_atomic* interfaces in all architectures are pretty much the same
except for post map operations (flush) and pre- and post unmap operations.
@@ -20,7 +20,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 files changed, 211 insertions(+), 18 deletions(-)
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 3297bfca78ed..14d5b4020c8c 100644
+index 3297bfca78edd..14d5b4020c8ca 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -31,9 +31,16 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size)
@@ -164,7 +164,7 @@ index 3297bfca78ed..14d5b4020c8c 100644
#ifndef clear_user_highpage
static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
diff --git a/mm/Kconfig b/mm/Kconfig
-index 390165ffbb0f..8c49d09da214 100644
+index 390165ffbb0fc..8c49d09da2141 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -859,4 +859,7 @@ config ARCH_HAS_HUGEPD
@@ -176,7 +176,7 @@ index 390165ffbb0f..8c49d09da214 100644
+
endmenu
diff --git a/mm/highmem.c b/mm/highmem.c
-index 6abfd762eee7..bb4ce13ee7e7 100644
+index 6abfd762eee73..bb4ce13ee7e77 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -31,9 +31,11 @@
@@ -342,5 +342,5 @@ index 6abfd762eee7..bb4ce13ee7e7 100644
#if defined(HASHED_PAGE_VIRTUAL)
--
-2.43.0
+2.44.0