diff options
Diffstat (limited to '')
-rw-r--r-- | debian/patches-rt/0041-highmem-Get-rid-of-kmap_types.h.patch | 189 |
1 files changed, 189 insertions, 0 deletions
diff --git a/debian/patches-rt/0041-highmem-Get-rid-of-kmap_types.h.patch b/debian/patches-rt/0041-highmem-Get-rid-of-kmap_types.h.patch new file mode 100644 index 000000000..d492fb27f --- /dev/null +++ b/debian/patches-rt/0041-highmem-Get-rid-of-kmap_types.h.patch @@ -0,0 +1,189 @@ +From 78d1ee2f2f990b4876ce2e64c637a660911a903d Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner <tglx@linutronix.de> +Date: Tue, 3 Nov 2020 10:27:30 +0100 +Subject: [PATCH 041/323] highmem: Get rid of kmap_types.h +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz + +The header is not longer used and on alpha, ia64, openrisc, parisc and um +it was completely unused anyway as these architectures have no highmem +support. + +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + arch/alpha/include/asm/kmap_types.h | 15 --------------- + arch/ia64/include/asm/kmap_types.h | 13 ------------- + arch/openrisc/mm/init.c | 1 - + arch/openrisc/mm/ioremap.c | 1 - + arch/parisc/include/asm/kmap_types.h | 13 ------------- + arch/um/include/asm/fixmap.h | 1 - + arch/um/include/asm/kmap_types.h | 13 ------------- + include/asm-generic/Kbuild | 1 - + include/asm-generic/kmap_types.h | 11 ----------- + include/linux/highmem.h | 2 -- + 10 files changed, 71 deletions(-) + delete mode 100644 arch/alpha/include/asm/kmap_types.h + delete mode 100644 arch/ia64/include/asm/kmap_types.h + delete mode 100644 arch/parisc/include/asm/kmap_types.h + delete mode 100644 arch/um/include/asm/kmap_types.h + delete mode 100644 include/asm-generic/kmap_types.h + +diff --git a/arch/alpha/include/asm/kmap_types.h b/arch/alpha/include/asm/kmap_types.h +deleted file mode 100644 +index 651714b45729..000000000000 +--- a/arch/alpha/include/asm/kmap_types.h ++++ /dev/null +@@ -1,15 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef _ASM_KMAP_TYPES_H +-#define _ASM_KMAP_TYPES_H +- +-/* Dummy header just to define km_type. */ +- +-#ifdef CONFIG_DEBUG_HIGHMEM +-#define __WITH_KM_FENCE +-#endif +- +-#include <asm-generic/kmap_types.h> +- +-#undef __WITH_KM_FENCE +- +-#endif +diff --git a/arch/ia64/include/asm/kmap_types.h b/arch/ia64/include/asm/kmap_types.h +deleted file mode 100644 +index 5c268cf7c2bd..000000000000 +--- a/arch/ia64/include/asm/kmap_types.h ++++ /dev/null +@@ -1,13 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef _ASM_IA64_KMAP_TYPES_H +-#define _ASM_IA64_KMAP_TYPES_H +- +-#ifdef CONFIG_DEBUG_HIGHMEM +-#define __WITH_KM_FENCE +-#endif +- +-#include <asm-generic/kmap_types.h> +- +-#undef __WITH_KM_FENCE +- +-#endif /* _ASM_IA64_KMAP_TYPES_H */ +diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c +index 5e88c351e6a4..f3fa02b8838a 100644 +--- a/arch/openrisc/mm/init.c ++++ b/arch/openrisc/mm/init.c +@@ -33,7 +33,6 @@ + #include <asm/io.h> + #include <asm/tlb.h> + #include <asm/mmu_context.h> +-#include <asm/kmap_types.h> + #include <asm/fixmap.h> + #include <asm/tlbflush.h> + #include <asm/sections.h> +diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c +index a978590d802d..5aed97a18bac 100644 +--- a/arch/openrisc/mm/ioremap.c ++++ b/arch/openrisc/mm/ioremap.c +@@ -15,7 +15,6 @@ + #include <linux/io.h> + #include <linux/pgtable.h> + #include <asm/pgalloc.h> +-#include <asm/kmap_types.h> + #include <asm/fixmap.h> + #include <asm/bug.h> + #include <linux/sched.h> +diff --git a/arch/parisc/include/asm/kmap_types.h b/arch/parisc/include/asm/kmap_types.h +deleted file mode 100644 +index 3e70b5cd1123..000000000000 +--- a/arch/parisc/include/asm/kmap_types.h ++++ /dev/null +@@ -1,13 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef _ASM_KMAP_TYPES_H +-#define _ASM_KMAP_TYPES_H +- +-#ifdef CONFIG_DEBUG_HIGHMEM +-#define __WITH_KM_FENCE +-#endif +- +-#include <asm-generic/kmap_types.h> +- +-#undef __WITH_KM_FENCE +- +-#endif +diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/asm/fixmap.h +index 2c697a145ac1..2efac5827188 100644 +--- a/arch/um/include/asm/fixmap.h ++++ b/arch/um/include/asm/fixmap.h +@@ -3,7 +3,6 @@ + #define __UM_FIXMAP_H + + #include <asm/processor.h> +-#include <asm/kmap_types.h> + #include <asm/archparam.h> + #include <asm/page.h> + #include <linux/threads.h> +diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h +deleted file mode 100644 +index b0bd12de1d23..000000000000 +--- a/arch/um/include/asm/kmap_types.h ++++ /dev/null +@@ -1,13 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-/* +- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) +- */ +- +-#ifndef __UM_KMAP_TYPES_H +-#define __UM_KMAP_TYPES_H +- +-/* No more #include "asm/arch/kmap_types.h" ! */ +- +-#define KM_TYPE_NR 14 +- +-#endif +diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild +index 3114a6da7e56..267f6dfb8960 100644 +--- a/include/asm-generic/Kbuild ++++ b/include/asm-generic/Kbuild +@@ -30,7 +30,6 @@ mandatory-y += irq.h + mandatory-y += irq_regs.h + mandatory-y += irq_work.h + mandatory-y += kdebug.h +-mandatory-y += kmap_types.h + mandatory-y += kmap_size.h + mandatory-y += kprobes.h + mandatory-y += linkage.h +diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h +deleted file mode 100644 +index 9f95b7b63d19..000000000000 +--- a/include/asm-generic/kmap_types.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef _ASM_GENERIC_KMAP_TYPES_H +-#define _ASM_GENERIC_KMAP_TYPES_H +- +-#ifdef __WITH_KM_FENCE +-# define KM_TYPE_NR 41 +-#else +-# define KM_TYPE_NR 20 +-#endif +- +-#endif +diff --git a/include/linux/highmem.h b/include/linux/highmem.h +index fbede783dc34..a5ce45dceae0 100644 +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h +@@ -29,8 +29,6 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size) + } + #endif + +-#include <asm/kmap_types.h> +- + /* + * Outside of CONFIG_HIGHMEM to support X86 32bit iomap_atomic() cruft. + */ +-- +2.43.0 + |