The patch titled
Subject: [patch] mm-memcontrol-lockless-page-counters-fix
has been removed from the -mm tree. Its filename was
mm-memcontrol-lockless-page-counters-fix-fix.patch
This patch was dropped because it was folded into mm-memcontrol-lockless-page-counters.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: [patch] mm-memcontrol-lockless-page-counters-fix
add includes for WARN_ON_ONCE, memparse, strncmp, and PAGE_SIZE
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_counter.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN mm/page_counter.c~mm-memcontrol-lockless-page-counters-fix-fix mm/page_counter.c
--- a/mm/page_counter.c~mm-memcontrol-lockless-page-counters-fix-fix
+++ a/mm/page_counter.c
@@ -4,11 +4,13 @@
* Copyright (C) 2014 Red Hat, Inc., Johannes Weiner
*/
-#include <linux/kernel.h>
-#include <linux/bug.h>
#include <linux/page_counter.h>
#include <linux/atomic.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
#include <linux/sched.h>
+#include <linux/bug.h>
+#include <asm/page.h>
/**
* page_counter_cancel - take pages out of the local counter
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory.patch
slab-improve-checking-for-invalid-gfp_flags.patch
mm-memcontrol-lockless-page-counters.patch
kernel-res_counter-remove-the-unused-api-fix.patch
mm-compaction-simplify-deferred-compaction-fix.patch
mm-compaction-always-update-cached-scanner-positions-fix-checkpatch-fixes.patch
mm-memcontrol-remove-unnecessary-pcg_used-pc-mem_cgroup-valid-flag-fix.patch
mm-memcontrol-fold-mem_cgroup_start_move-mem_cgroup_end_move-fix.patch
mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2-fix.patch
fs-proc-use-a-rb-tree-for-the-directory-entries-fix.patch
fs-binfmt_miscc-use-gfp_kernel-instead-of-gfp_user.patch
init-allow-config_init_fallback=n-to-disable-defaults-if-init=-fails-checkpatch-fixes.patch
rtc-omap-add-support-for-pmic_power_en-v3-fix.patch
drivers-rtc-rtc-sirfsocc-add-alarm_irq_enable-support-fix.patch
rtc-ds1374-add-watchdog-support-fix.patch
rtc-ds1374-add-watchdog-support-checkpatch-fixes.patch
exit-wait-cleanup-the-ptrace_reparented-checks-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
