Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2

 - most(?) of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (125 commits)
  thp: fix comments of __pmd_trans_huge_lock()
  cgroup: remove unnecessary 0 check from css_from_id()
  cgroup: fix idr leak for the first cgroup root
  mm: memcontrol: fix documentation for compound parameter
  mm: memcontrol: remove BUG_ON in uncharge_list
  mm: fix build warnings in <linux/compaction.h>
  mm, thp: convert from optimistic swapin collapsing to conservative
  mm, thp: fix comment inconsistency for swapin readahead functions
  thp: update Documentation/{vm/transhuge,filesystems/proc}.txt
  shmem: split huge pages beyond i_size under memory pressure
  thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE
  khugepaged: add support of collapse for tmpfs/shmem pages
  shmem: make shmem_inode_info::lock irq-safe
  khugepaged: move up_read(mmap_sem) out of khugepaged_alloc_page()
  thp: extract khugepaged from mm/huge_memory.c
  shmem, thp: respect MADV_{NO,}HUGEPAGE for file mappings
  shmem: add huge pages support
  shmem: get_unmapped_area align huge page
  shmem: prepare huge= mount option and sysfs knob
  mm, rmap: account shmem thp pages
  ...

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/vm/page_owner_sort.c b/tools/vm/page_owner_sort.c
index 77147b42d598..f1c055f3c243 100644
--- a/tools/vm/page_owner_sort.c
+++ b/tools/vm/page_owner_sort.c
@@ -79,12 +79,12 @@ static void add_list(char *buf, int len)
         }
 }
 
-#define BUF_SIZE        1024
+#define BUF_SIZE        (128 * 1024)
 
 int main(int argc, char **argv)
 {
         FILE *fin, *fout;
-        char buf[BUF_SIZE];
+        char *buf;
         int ret, i, count;
         struct block_list *list2;
         struct stat st;
@@ -107,6 +107,11 @@ int main(int argc, char **argv)
         max_size = st.st_size / 100; /* hack ... */
 
         list = malloc(max_size * sizeof(*list));
+        buf = malloc(BUF_SIZE);
+        if (!list || !buf) {
+                printf("Out of memory\n");
+                exit(1);
+        }
 
         for ( ; ; ) {
                 ret = read_block(buf, BUF_SIZE, fin);