The patch titled
Subject: psi-introduce-psi-monitor-fix
has been added to the -mm tree. Its filename is
psi-introduce-psi-monitor-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/psi-introduce-psi-monitor-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/psi-introduce-psi-monitor-fix.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: psi-introduce-psi-monitor-fix
make psi_enable static
Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sched/psi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/kernel/sched/psi.c~psi-introduce-psi-monitor-fix
+++ a/kernel/sched/psi.c
@@ -148,9 +148,9 @@ static int psi_bug __read_mostly;
DEFINE_STATIC_KEY_FALSE(psi_disabled);
#ifdef CONFIG_PSI_DEFAULT_DISABLED
-bool psi_enable;
+static bool psi_enable;
#else
-bool psi_enable = true;
+static bool psi_enable = true;
#endif
static int __init setup_psi(char *str)
{
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
revert-initramfs-cleanup-incomplete-rootfs.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slub-introduce-slab_warn_on_error-fix.patch
mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
psi-introduce-psi-monitor-fix.patch
psi-introduce-psi-monitor-fix-fix.patch
mm-proportional-memorylowmin-reclaim-checkpatch-fixes.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-fix-fix.patch
mm-add-probe_user_read-fix.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch
filemap-drop-the-mmap_sem-for-all-blocking-operations-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
memblock-update-comments-and-kernel-doc-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
