summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch')
-rw-r--r--debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch b/debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch
index 667836a1e..4c5c4600d 100644
--- a/debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch
+++ b/debian/patches-rt/0034-csky-mm-highmem-Switch-to-generic-kmap-atomic.patch
@@ -1,8 +1,8 @@
-From 3af9ca89d4398239a71471cffb488e3104990e23 Mon Sep 17 00:00:00 2001
+From 0e38df09c184ce7c455dcb4103bc3785bb15d55c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Nov 2020 10:27:23 +0100
Subject: [PATCH 034/323] csky/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
No reason having the same code in every architecture.
@@ -17,7 +17,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
4 files changed, 8 insertions(+), 78 deletions(-)
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
-index 7bf0a617e94c..c9f2533cc53d 100644
+index 7bf0a617e94c3..c9f2533cc53db 100644
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@ -286,6 +286,7 @@ config NR_CPUS
@@ -29,7 +29,7 @@ index 7bf0a617e94c..c9f2533cc53d 100644
config FORCE_MAX_ZONEORDER
diff --git a/arch/csky/include/asm/fixmap.h b/arch/csky/include/asm/fixmap.h
-index 81f9477d5330..4b589cc20900 100644
+index 81f9477d5330c..4b589cc209000 100644
--- a/arch/csky/include/asm/fixmap.h
+++ b/arch/csky/include/asm/fixmap.h
@@ -8,7 +8,7 @@
@@ -51,7 +51,7 @@ index 81f9477d5330..4b589cc20900 100644
__end_of_fixed_addresses
};
diff --git a/arch/csky/include/asm/highmem.h b/arch/csky/include/asm/highmem.h
-index 14645e3d5cd5..1f4ed3f4c0d9 100644
+index 14645e3d5cd52..1f4ed3f4c0d9b 100644
--- a/arch/csky/include/asm/highmem.h
+++ b/arch/csky/include/asm/highmem.h
@@ -9,7 +9,7 @@
@@ -78,7 +78,7 @@ index 14645e3d5cd5..1f4ed3f4c0d9 100644
#endif /* __KERNEL__ */
diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c
-index 89c10800a002..4161df3c6c15 100644
+index 89c10800a002e..4161df3c6c152 100644
--- a/arch/csky/mm/highmem.c
+++ b/arch/csky/mm/highmem.c
@@ -9,8 +9,6 @@
@@ -175,5 +175,5 @@ index 89c10800a002..4161df3c6c15 100644
- kmap_pte = pte_offset_kernel((pmd_t *)pgd_offset_k(vaddr), vaddr);
-}
--
-2.43.0
+2.44.0