The patch titled Subject: kmap: stupid hacks to make it compile has been removed from the -mm tree. Its filename was kmap-stupid-hacks-to-make-it-compile.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: kmap: stupid hacks to make it compile Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/fork.c | 3 ++- kernel/sched/core.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) --- a/kernel/fork.c~kmap-stupid-hacks-to-make-it-compile +++ a/kernel/fork.c @@ -77,6 +77,7 @@ #include <linux/random.h> #include <linux/tty.h> #include <linux/blkdev.h> +#include <linux/highmem.h> #include <linux/fs_struct.h> #include <linux/magic.h> #include <linux/perf_event.h> @@ -932,7 +933,7 @@ static struct task_struct *dup_task_stru account_kernel_stack(tsk, 1); kcov_task_init(tsk); - kmap_local_fork(tsk); +// kmap_local_fork(tsk); #ifdef CONFIG_FAULT_INJECTION tsk->fail_nth = 0; --- a/kernel/sched/core.c~kmap-stupid-hacks-to-make-it-compile +++ a/kernel/sched/core.c @@ -4094,16 +4094,16 @@ static inline void finish_lock_switch(st static inline void kmap_local_sched_out(void) { #ifdef CONFIG_KMAP_LOCAL - if (unlikely(current->kmap_ctrl.idx)) - __kmap_local_sched_out(); +// if (unlikely(current->kmap_ctrl.idx)) +// __kmap_local_sched_out(); #endif } static inline void kmap_local_sched_in(void) { #ifdef CONFIG_KMAP_LOCAL - if (unlikely(current->kmap_ctrl.idx)) - __kmap_local_sched_in(); +// if (unlikely(current->kmap_ctrl.idx)) +// __kmap_local_sched_in(); #endif } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint-fix.patch ubsan-disable-unsigned-integer-overflow-sanitizer-with-clang-fix.patch mm.patch mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account-fix.patch mm-memcontrol-optimize-per-lruvec-stats-counter-memory-usage-checkpatch-fixes.patch mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch kfence-kasan-make-kfence-compatible-with-kasan-fix.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages-fix.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch