diff --git a/[refs] b/[refs] index a8f071c6a321..9a20fb246475 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8da3430d8a7f885c2bf65121181d76c9d290a86e +refs/heads/master: 3b1d92c56514987010bb0201b5c71aeb633fc4f8 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index f564717d22f3..542fc088ff50 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -3199,7 +3199,8 @@ int min_free_kbytes_sysctl_handler(ctl_table *table, int write, struct file *file, void __user *buffer, size_t *length, loff_t *ppos) { proc_dointvec(table, write, file, buffer, length, ppos); - setup_per_zone_pages_min(); + if (write) + setup_per_zone_pages_min(); return 0; }