The patch titled
Subject: mm-handle-lru_add_drain_all-for-up-properly-fix
has been removed from the -mm tree. Its filename was
mm-handle-lru_add_drain_all-for-up-properly-fix.patch
This patch was dropped because it was folded into mm-handle-lru_add_drain_all-for-up-properly.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-handle-lru_add_drain_all-for-up-properly-fix
fix various build warnings
In file included from ./include/asm-generic/percpu.h:7:0,
from ./arch/x86/include/asm/percpu.h:544,
from ./arch/x86/include/asm/preempt.h:6,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:51,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:6,
from ./include/linux/mm.h:10,
from mm/swap.c:16:
mm/swap.c:661:43: warning: 'lru_add_drain_work' defined but not used [-Wunused-variable]
static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
^
./include/linux/percpu-defs.h:103:37: note: in definition of macro 'DEFINE_PER_CPU_SECTION'
__PCPU_ATTRS(sec) __typeof__(type) name
^~~~
mm/swap.c:661:8: note: in expansion of macro 'DEFINE_PER_CPU'
static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
^~~~~~~~~~~~~~
mm/swap.c:656:13: warning: 'lru_add_drain_per_cpu' defined but not used [-Wunused-function]
static void lru_add_drain_per_cpu(struct work_struct *dummy)
^~~~~~~~~~~~~~~~~~~~~
mm/swap.c:323:13: warning: 'need_activate_page_drain' defined but not used [-Wunused-function]
static bool need_activate_page_drain(int cpu)
^~~~~~~~~~~~~~~~~~~~~~~~
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
--- a/mm/swap.c~mm-handle-lru_add_drain_all-for-up-properly-fix
+++ a/mm/swap.c
@@ -320,11 +320,6 @@ static inline void activate_page_drain(i
{
}
-static bool need_activate_page_drain(int cpu)
-{
- return false;
-}
-
void activate_page(struct page *page)
{
struct zone *zone = page_zone(page);
@@ -653,14 +648,15 @@ void lru_add_drain(void)
put_cpu();
}
+#ifdef CONFIG_SMP
+
+static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
+
static void lru_add_drain_per_cpu(struct work_struct *dummy)
{
lru_add_drain();
}
-static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
-
-#ifdef CONFIG_SMP
/*
* Doesn't need any cpu hotplug locking because we do rely on per-cpu
* kworkers being shut down before our page_alloc_cpu_dead callback is
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
revert-initramfs-cleanup-incomplete-rootfs.patch
mm-handle-lru_add_drain_all-for-up-properly.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
psi-introduce-psi-monitor-fix-3.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
mm-refactor-readahead-defines-in-mmh-fix.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3-fix.patch
memblock-update-comments-and-kernel-doc-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
