The patch titled
Subject: mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix
has been removed from the -mm tree. Its filename was
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix.patch
This patch was dropped because it was folded into mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix
fix CONFIG_MEMCG_KMEM=n build errors and warning
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Dennis Zhou <dennis@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Tobin C. Harding <tobin@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/percpu.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/mm/percpu.c~mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix
+++ a/mm/percpu.c
@@ -1438,7 +1438,9 @@ static struct pcpu_chunk *pcpu_alloc_chu
return chunk;
+#ifdef CONFIG_MEMCG_KMEM
objcg_fail:
+#endif
pcpu_mem_free(chunk->md_blocks);
md_blocks_fail:
pcpu_mem_free(chunk->bound_map);
@@ -1630,13 +1632,13 @@ static void pcpu_memcg_free_hook(struct
}
#else /* CONFIG_MEMCG_KMEM */
-static enum pcpu_chunk_type pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp,
- struct mem_cgroup **memcgp)
+static enum pcpu_chunk_type
+pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp, struct obj_cgroup **objcgp)
{
return PCPU_CHUNK_ROOT;
}
-static void pcpu_memcg_post_alloc_hook(struct mem_cgroup *memcg,
+static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg,
struct pcpu_chunk *chunk, int off,
size_t size)
{
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch
mm-hugetlb-add-mempolicy-check-in-the-reservation-routine-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.patch
mm-migrate-make-a-standard-migration-target-allocation-function-fix.patch
mm.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
