Commit 056cdce0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (21 commits)
  mm: revert mremap pud_free anti-fix
  mm: fix BUG in __split_huge_page_pmd
  swap: fix set_blocksize race during swapon/swapoff
  procfs: call default get_unmapped_area on MMU-present architectures
  procfs: fix unintended truncation of returned mapped address
  writeback: fix negative bdi max pause
  percpu_refcount: export symbols
  fs: buffer: move allocation failure loop into the allocator
  mm: memcg: handle non-error OOM situations more gracefully
  tools/testing/selftests: fix uninitialized variable
  block/partitions/efi.c: treat size mismatch as a warning, not an error
  mm: hugetlb: initialize PG_reserved for tail pages of gigantic compound pages
  mm/zswap: bugfix: memory leak when re-swapon
  mm: /proc/pid/pagemap: inspect _PAGE_SOFT_DIRTY only on present pages
  mm: migration: do not lose soft dirty bit if page is in migration state
  gcov: MAINTAINERS: Add an entry for gcov
  mm/hugetlb.c: correct missing private flag clearing
  mm/vmscan.c: don't forget to free shrinker->nr_deferred
  ipc/sem.c: synchronize semop and semctl with IPC_RMID
  ipc: update locking scheme comments
  ...
parents 0056019d 57a8f0cd

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3624,6 +3624,12 @@ L: linux-scsi@vger.kernel.org 
S:	Odd Fixes (e.g., new signatures)

F:	drivers/scsi/fdomain.*



GCOV BASED KERNEL PROFILING

M:	Peter Oberparleiter <oberpar@linux.vnet.ibm.com>

S:	Maintained

F:	kernel/gcov/

F:	Documentation/gcov.txt



GDT SCSI DISK ARRAY CONTROLLER DRIVER

M:	Achim Leubner <achim_leubner@adaptec.com>

L:	linux-scsi@vger.kernel.org

block/partitions/efi.c

+6 −1
Original line number Diff line number Diff line
@@ -222,11 +222,16 @@ check_hybrid: 
	 * the disk size.

	 *

	 * Hybrid MBRs do not necessarily comply with this.

	 *

	 * Consider a bad value here to be a warning to support dd'ing

	 * an image from a smaller disk to a larger disk.

	 */

	if (ret == GPT_MBR_PROTECTIVE) {

		sz = le32_to_cpu(mbr->partition_record[part].size_in_lba);

		if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF)

			ret = 0;

			pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n",

				 sz, min_t(uint32_t,

					   total_sectors - 1, 0xFFFFFFFF));

	}

done:

	return ret;

fs/buffer.c

+12 −2
Original line number Diff line number Diff line
@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block, 
	struct buffer_head *bh;

	sector_t end_block;

	int ret = 0;		/* Will call free_more_memory() */

	gfp_t gfp_mask;



	page = find_or_create_page(inode->i_mapping, index,

		(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE);

	gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS;

	gfp_mask |= __GFP_MOVABLE;

	/*

	 * XXX: __getblk_slow() can not really deal with failure and

	 * will endlessly loop on improvised global reclaim.  Prefer

	 * looping in the allocator rather than here, at least that

	 * code knows what it's doing.

	 */

	gfp_mask |= __GFP_NOFAIL;



	page = find_or_create_page(inode->i_mapping, index, gfp_mask);

	if (!page)

		return ret;

fs/proc/inode.c

+7 −3
Original line number Diff line number Diff line
@@ -288,9 +288,13 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) 
static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)

{

	struct proc_dir_entry *pde = PDE(file_inode(file));

	int rv = -EIO;

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);

	unsigned long rv = -EIO;

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL;

	if (use_pde(pde)) {

#ifdef CONFIG_MMU

		get_unmapped_area = current->mm->get_unmapped_area;

#endif

		if (pde->proc_fops->get_unmapped_area)

			get_unmapped_area = pde->proc_fops->get_unmapped_area;

		if (get_unmapped_area)

			rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);

fs/proc/task_mmu.c

+3 −1
Original line number Diff line number Diff line
@@ -941,6 +941,8 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm, 
		frame = pte_pfn(pte);

		flags = PM_PRESENT;

		page = vm_normal_page(vma, addr, pte);

		if (pte_soft_dirty(pte))

			flags2 |= __PM_SOFT_DIRTY;

	} else if (is_swap_pte(pte)) {

		swp_entry_t entry;

		if (pte_swp_soft_dirty(pte))
@@ -960,7 +962,7 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm, 


	if (page && !PageAnon(page))

		flags |= PM_FILE;

	if ((vma->vm_flags & VM_SOFTDIRTY) || pte_soft_dirty(pte))

	if ((vma->vm_flags & VM_SOFTDIRTY))

		flags2 |= __PM_SOFT_DIRTY;



	*pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE