Commit 349111f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "11 patches.

  Subsystems affected by this: misc, mm/hugetlb, mm/vmalloc, mm/misc,
  romfs, relay, uprobes, squashfs, mm/cma, mm/pagealloc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, page_alloc: fix core hung in free_pcppages_bulk()
  mm: include CMA pages in lowmem_reserve at boot
  squashfs: avoid bio_alloc() failure with 1Mbyte blocks
  uprobes: __replace_page() avoid BUG in munlock_vma_page()
  kernel/relay.c: fix memleak on destroy relay channel
  romfs: fix uninitialized memory leak in romfs_dev_read()
  mm/rodata_test.c: fix missing function declaration
  mm/vunmap: add cond_resched() in vunmap_pmd_range
  khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
  hugetlb_cgroup: convert comma to semicolon
  mailmap: add Andi Kleen
parents f22c5579 88e8ac11

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com> 
Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>

Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andrew Morton <akpm@linux-foundation.org>

fs/romfs/storage.c

+1 −3
Original line number Diff line number Diff line
@@ -217,10 +217,8 @@ int romfs_dev_read(struct super_block *sb, unsigned long pos, 
	size_t limit;



	limit = romfs_maxsize(sb);

	if (pos >= limit)

	if (pos >= limit || buflen > limit - pos)

		return -EIO;

	if (buflen > limit - pos)

		buflen = limit - pos;



#ifdef CONFIG_ROMFS_ON_MTD

	if (sb->s_mtd)

fs/squashfs/block.c

+5 −1
Original line number Diff line number Diff line
@@ -87,7 +87,11 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length, 
	int error, i;

	struct bio *bio;



	if (page_count <= BIO_MAX_PAGES)

		bio = bio_alloc(GFP_NOIO, page_count);

	else

		bio = bio_kmalloc(GFP_NOIO, page_count);



	if (!bio)

		return -ENOMEM;

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 
		try_to_free_swap(old_page);

	page_vma_mapped_walk_done(&pvmw);



	if (vma->vm_flags & VM_LOCKED)

	if ((vma->vm_flags & VM_LOCKED) && !PageCompound(old_page))

		munlock_vma_page(old_page);

	put_page(old_page);

kernel/relay.c

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan) 
static void relay_destroy_channel(struct kref *kref)

{

	struct rchan *chan = container_of(kref, struct rchan, kref);

	free_percpu(chan->buf);

	kfree(chan);

}