Merge branch 'akpm' (fixes from Andrew Morton)

Merge patch-bomb from Andrew Morton:
 - part of OCFS2 (review is laggy again)
 - procfs
 - slab
 - all of MM
 - zram, zbud
 - various other random things: arch, filesystems.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (164 commits)
  nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
  include/linux/screen_info.h: remove unused ORIG_* macros
  kernel/sys.c: compat sysinfo syscall: fix undefined behavior
  kernel/sys.c: whitespace fixes
  acct: eliminate compile warning
  kernel/async.c: switch to pr_foo()
  include/linux/blkdev.h: use NULL instead of zero
  include/linux/kernel.h: deduplicate code implementing clamp* macros
  include/linux/kernel.h: rewrite min3, max3 and clamp using min and max
  alpha: use Kbuild logic to include <asm-generic/sections.h>
  frv: remove deprecated IRQF_DISABLED
  frv: remove unused cpuinfo_frv and friends to fix future build error
  zbud: avoid accessing last unused freelist
  zsmalloc: simplify init_zspage free obj linking
  mm/zsmalloc.c: correct comment for fullness group computation
  zram: use notify_free to account all free notifications
  zram: report maximum used memory
  zram: zram memory size limitation
  zsmalloc: change return value unit of zs_get_total_size_bytes
  zsmalloc: move pages_allocated to zs_pool
  ...

3 files changed, 35 insertions, 13 deletions

diff --git a/Documentation/ABI/stable/sysfs-devices-node b/Documentation/ABI/stable/sysfs-devices-node
index ce259c13c36a..5b2d0f08867c 100644
--- a/Documentation/ABI/stable/sysfs-devices-node
+++ b/Documentation/ABI/stable/sysfs-devices-node
@@ -85,14 +85,6 @@ Description:
                 will be compacted. When it completes, memory will be freed
                 into blocks which have as many contiguous pages as possible
 
-What:           /sys/devices/system/node/nodeX/scan_unevictable_pages
-Date:           October 2008
-Contact:        Lee Schermerhorn <lee.schermerhorn@hp.com>
-Description:
-                When set, it triggers scanning the node's unevictable lists
-                and move any pages that have become evictable onto the respective
-                zone's inactive list. See mm/vmscan.c
-
 What:           /sys/devices/system/node/nodeX/hugepages/hugepages-<size>/
 Date:           December 2009
 Contact:        Lee Schermerhorn <lee.schermerhorn@hp.com>
diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
index 70ec992514d0..a6148eaf91e5 100644
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -77,11 +77,14 @@ What:		/sys/block/zram<id>/notify_free
 Date:           August 2010
 Contact:        Nitin Gupta <ngupta@vflare.org>
 Description:
-                The notify_free file is read-only and specifies the number of
-                swap slot free notifications received by this device. These
-                notifications are sent to a swap block device when a swap slot
-                is freed. This statistic is applicable only when this disk is
-                being used as a swap disk.
+                The notify_free file is read-only. Depending on device usage
+                scenario it may account a) the number of pages freed because
+                of swap slot free notifications or b) the number of pages freed
+                because of REQ_DISCARD requests sent by bio. The former ones
+                are sent to a swap block device when a swap slot is freed, which
+                implies that this disk is being used as a swap disk. The latter
+                ones are sent by filesystem mounted with discard option,
+                whenever some data blocks are getting discarded.
 
 What:           /sys/block/zram<id>/zero_pages
 Date:           August 2010
@@ -119,3 +122,22 @@ Description:
                 efficiency can be calculated using compr_data_size and this
                 statistic.
                 Unit: bytes
+
+What:           /sys/block/zram<id>/mem_used_max
+Date:           August 2014
+Contact:        Minchan Kim <minchan@kernel.org>
+Description:
+                The mem_used_max file is read/write and specifies the amount
+                of maximum memory zram have consumed to store compressed data.
+                For resetting the value, you should write "0". Otherwise,
+                you could see -EINVAL.
+                Unit: bytes
+
+What:           /sys/block/zram<id>/mem_limit
+Date:           August 2014
+Contact:        Minchan Kim <minchan@kernel.org>
+Description:
+                The mem_limit file is read/write and specifies the maximum
+                amount of memory ZRAM can use to store the compressed data.  The
+                limit could be changed in run time and "0" means disable the
+                limit.  No limit is the initial state.  Unit: bytes
diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index 7405de26ee60..deef3b5723cf 100644
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -61,6 +61,14 @@ Users:		hotplug memory remove tools
                 http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 
 
+What:           /sys/devices/system/memory/memoryX/valid_zones
+Date:           July 2014
+Contact:        Zhang Zhen <zhenzhang.zhang@huawei.com>
+Description:
+                The file /sys/devices/system/memory/memoryX/valid_zones is
+                read-only and is designed to show which zone this memory
+                block can be onlined to.
+
 What:           /sys/devices/system/memoryX/nodeY
 Date:           October 2009
 Contact:        Linux Memory Management list <linux-mm@kvack.org>