The patch titled
Subject: kmap: stupid hacks to make it compile
has been added to the -mm tree. Its filename is
kmap-stupid-hacks-to-make-it-compile.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/kmap-stupid-hacks-to-make-it-compile.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/kmap-stupid-hacks-to-make-it-compile.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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>
@@ -930,7 +931,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
@@ -4093,16 +4093,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
kthread_worker-document-cpu-hotplug-handling-fix.patch
mm.patch
mm-remove-the-unuseful-else-after-a-return-checkpatch-fixes.patch
mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch
mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch
mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch
mm-truncateshmem-handle-truncates-that-split-thps-fix-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
lib-cmdline_kunit-add-a-new-test-suite-for-cmdline-api-fix.patch
ilog2-improve-ilog2-for-constant-arguments-checkpatch-fixes.patch
lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch
checkpatch-fix-typo_spelling-check-for-words-with-apostrophe-fix.patch
resource-fix-kernel-doc-markups-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
kmap-stupid-hacks-to-make-it-compile.patch
init-kconfig-dont-assume-scripts-lld-versionsh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
