diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-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/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch')
| -rw-r--r-- | debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch b/debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch index 5ac60d218..04ed25343 100644 --- a/debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch +++ b/debian/patches-rt/0039-sparc-mm-highmem-Switch-to-generic-kmap-atomic.patch @@ -1,8 +1,8 @@ -From 859a29e0206dcd137ea0db376a846246f1071bfb Mon Sep 17 00:00:00 2001 +From 7e2669a664ce1a4269d1a0d68adb58865b822174 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 3 Nov 2020 10:27:28 +0100 Subject: [PATCH 039/323] sparc/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 @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> delete mode 100644 arch/sparc/mm/highmem.c diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig -index 7e2ce4c8d657..1a6e4b187861 100644 +index 7e2ce4c8d6571..1a6e4b1878617 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -140,6 +140,7 @@ config MMU @@ -35,7 +35,7 @@ index 7e2ce4c8d657..1a6e4b187861 100644 config ZONE_DMA bool diff --git a/arch/sparc/include/asm/highmem.h b/arch/sparc/include/asm/highmem.h -index 6c35f0d27ee1..875116209ec1 100644 +index 6c35f0d27ee1a..875116209ec14 100644 --- a/arch/sparc/include/asm/highmem.h +++ b/arch/sparc/include/asm/highmem.h @@ -24,7 +24,6 @@ @@ -69,7 +69,7 @@ index 6c35f0d27ee1..875116209ec1 100644 #endif /* _ASM_HIGHMEM_H */ diff --git a/arch/sparc/include/asm/kmap_types.h b/arch/sparc/include/asm/kmap_types.h deleted file mode 100644 -index 55a99b6bd91e..000000000000 +index 55a99b6bd91e0..0000000000000 --- a/arch/sparc/include/asm/kmap_types.h +++ /dev/null @@ -1,11 +0,0 @@ @@ -85,7 +85,7 @@ index 55a99b6bd91e..000000000000 - -#endif diff --git a/arch/sparc/include/asm/vaddrs.h b/arch/sparc/include/asm/vaddrs.h -index 84d054b07a6f..4fec0341e2a8 100644 +index 84d054b07a6ff..4fec0341e2a81 100644 --- a/arch/sparc/include/asm/vaddrs.h +++ b/arch/sparc/include/asm/vaddrs.h @@ -32,13 +32,13 @@ @@ -105,7 +105,7 @@ index 84d054b07a6f..4fec0341e2a8 100644 __end_of_fixed_addresses }; diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile -index b078205b70e0..68db1f859b02 100644 +index b078205b70e0b..68db1f859b028 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile @@ -15,6 +15,3 @@ obj-$(CONFIG_SPARC32) += leon_mm.o @@ -117,7 +117,7 @@ index b078205b70e0..68db1f859b02 100644 -obj-$(CONFIG_HIGHMEM) += highmem.o diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c deleted file mode 100644 -index 8f2a2afb048a..000000000000 +index 8f2a2afb048a2..0000000000000 --- a/arch/sparc/mm/highmem.c +++ /dev/null @@ -1,115 +0,0 @@ @@ -237,7 +237,7 @@ index 8f2a2afb048a..000000000000 -} -EXPORT_SYMBOL(kunmap_atomic_high); diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c -index 0070f8b9a753..a03caa5f6628 100644 +index 0070f8b9a753a..a03caa5f6628d 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -971,8 +971,6 @@ void __init srmmu_paging_init(void) @@ -250,5 +250,5 @@ index 0070f8b9a753..a03caa5f6628 100644 unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 }; -- -2.43.0 +2.44.0 |