The patch titled
mm: add dirty_background_bytes and dirty_bytes sysctls fix
has been removed from the -mm tree. Its filename was
mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix.patch
This patch was dropped because it was folded into mm-add-dirty_background_bytes-and-dirty_bytes-sysctls.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm: add dirty_background_bytes and dirty_bytes sysctls fix
From: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Cc: Andrea Righi <righi.andrea@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sysctl.c | 9 +++------
mm/page-writeback.c | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff -puN kernel/sysctl.c~mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix kernel/sysctl.c
--- a/kernel/sysctl.c~mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix
+++ a/kernel/sysctl.c
@@ -88,10 +88,6 @@ extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
/* Constants used for minimum and maximum */
-#if defined(CONFIG_HIGHMEM) || defined(CONFIG_DETECT_SOFTLOCKUP)
-static int one = 1;
-#endif
-
#ifdef CONFIG_DETECT_SOFTLOCKUP
static int sixty = 60;
static int neg_one = -1;
@@ -102,6 +98,7 @@ static int two = 2;
#endif
static int zero;
+static int one = 1;
static int one_hundred = 100;
/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
@@ -956,7 +953,7 @@ static struct ctl_table vm_table[] = {
.mode = 0644,
.proc_handler = &dirty_background_bytes_handler,
.strategy = &sysctl_intvec,
- .extra1 = &zero,
+ .extra1 = &one,
},
{
.ctl_name = VM_DIRTY_RATIO,
@@ -977,7 +974,7 @@ static struct ctl_table vm_table[] = {
.mode = 0644,
.proc_handler = &dirty_bytes_handler,
.strategy = &sysctl_intvec,
- .extra1 = &zero,
+ .extra1 = &one,
},
{
.procname = "dirty_writeback_centisecs",
diff -puN mm/page-writeback.c~mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix mm/page-writeback.c
--- a/mm/page-writeback.c~mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix
+++ a/mm/page-writeback.c
@@ -435,7 +435,7 @@ get_dirty_limits(unsigned long *pbackgro
struct task_struct *tsk;
if (vm_dirty_bytes)
- dirty = (vm_dirty_bytes + PAGE_SIZE) / PAGE_SIZE;
+ dirty = DIV_ROUND_UP(vm_dirty_bytes, PAGE_SIZE);
else {
int dirty_ratio;
@@ -446,7 +446,7 @@ get_dirty_limits(unsigned long *pbackgro
}
if (dirty_background_bytes)
- background = (dirty_background_bytes + PAGE_SIZE) / PAGE_SIZE;
+ background = DIV_ROUND_UP(dirty_background_bytes, PAGE_SIZE);
else
background = (dirty_background_ratio * available_memory) / 100;
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
origin.patch
oom-fix-zone_scan_mutex-name.patch
oom-print-triggering-tasks-cpuset-and-mems-allowed.patch
mm-change-dirty-limit-type-specifiers-to-unsigned-long.patch
mm-add-dirty_background_bytes-and-dirty_bytes-sysctls.patch
mm-add-dirty_background_bytes-and-dirty_bytes-sysctls-fix.patch
mm-make-get_user_pages-interruptible.patch
mm-make-get_user_pages-interruptible-mmotm-ignore-sigkill-in-get_user_pages-during-munlock.patch
memory-cgroup-hierarchy-documentation-v4.patch
memory-cgroup-resource-counters-for-hierarchy-v4.patch
memory-cgroup-resource-counters-for-hierarchy-v4-checkpatch-fixes.patch
memory-cgroup-hierarchical-reclaim-v4.patch
memory-cgroup-hierarchical-reclaim-v4-checkpatch-fixes.patch
memory-cgroup-hierarchical-reclaim-v4-fix-for-hierarchical-reclaim.patch
memory-cgroup-hierarchy-feature-selector-v4.patch
memory-cgroup-hierarchy-feature-selector-v4-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
