Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f055f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge patches from Andrew Morton:
 "Ten fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  epoll: do not take the nested ep->mtx on EPOLL_CTL_DEL
  sh: add EXPORT_SYMBOL(min_low_pfn) and EXPORT_SYMBOL(max_low_pfn) to sh_ksyms_32.c
  drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()
  mm/memory-failure.c: transfer page count from head page to tail page after split thp
  MAINTAINERS: set up proper record for Xilinx Zynq
  mm: remove bogus warning in copy_huge_pmd()
  memcg: fix memcg_size() calculation
  mm: fix use-after-free in sys_remap_file_pages
  mm: munlock: fix deadlock in __munlock_pagevec()
  mm: munlock: fix a bug where THP tail page is encountered
parents 152b734a 4ff36ee9

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1368,6 +1368,9 @@ T: git git://git.xilinx.com/linux-xlnx.git 
S:	Supported

F:	arch/arm/mach-zynq/

F:	drivers/cpuidle/cpuidle-zynq.c

N:	zynq

N:	xilinx

F:	drivers/clocksource/cadence_ttc_timer.c



ARM SMMU DRIVER

M:	Will Deacon <will.deacon@arm.com>

arch/sh/kernel/sh_ksyms_32.c

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ EXPORT_SYMBOL(csum_partial_copy_generic); 
EXPORT_SYMBOL(copy_page);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(empty_zero_page);

#ifdef CONFIG_FLATMEM

/* need in pfn_valid macro */

EXPORT_SYMBOL(min_low_pfn);

EXPORT_SYMBOL(max_low_pfn);

#endif



#define DECLARE_EXPORT(name)		\

	extern void name(void);EXPORT_SYMBOL(name)

drivers/dma/ioat/dma.c

+10 −1
Original line number Diff line number Diff line
@@ -817,7 +817,15 @@ int ioat_dma_self_test(struct ioatdma_device *device) 
	}



	dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE);

	if (dma_mapping_error(dev, dma_src)) {

		dev_err(dev, "mapping src buffer failed\n");

		goto free_resources;

	}

	dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE);

	if (dma_mapping_error(dev, dma_dest)) {

		dev_err(dev, "mapping dest buffer failed\n");

		goto unmap_src;

	}

	flags = DMA_PREP_INTERRUPT;

	tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src,

						   IOAT_TEST_SIZE, flags);
@@ -855,8 +863,9 @@ int ioat_dma_self_test(struct ioatdma_device *device) 
	}



unmap_dma:

	dma_unmap_single(dev, dma_src, IOAT_TEST_SIZE, DMA_TO_DEVICE);

	dma_unmap_single(dev, dma_dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE);

unmap_src:

	dma_unmap_single(dev, dma_src, IOAT_TEST_SIZE, DMA_TO_DEVICE);

free_resources:

	dma->device_free_chan_resources(dma_chan);

out:

fs/eventpoll.c

+0 −4
Original line number Diff line number Diff line
@@ -1907,10 +1907,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, 
			}

		}

	}

	if (op == EPOLL_CTL_DEL && is_file_epoll(tf.file)) {

		tep = tf.file->private_data;

		mutex_lock_nested(&tep->mtx, 1);

	}



	/*

	 * Try to lookup the file inside our RB tree, Since we grabbed "mtx"

mm/fremap.c

+5 −3
Original line number Diff line number Diff line
@@ -208,9 +208,10 @@ get_write_lock: 
		if (mapping_cap_account_dirty(mapping)) {

			unsigned long addr;

			struct file *file = get_file(vma->vm_file);

			/* mmap_region may free vma; grab the info now */

			vm_flags = vma->vm_flags;



			addr = mmap_region(file, start, size,

					vma->vm_flags, pgoff);

			addr = mmap_region(file, start, size, vm_flags, pgoff);

			fput(file);

			if (IS_ERR_VALUE(addr)) {

				err = addr;
@@ -218,7 +219,7 @@ get_write_lock: 
				BUG_ON(addr != start);

				err = 0;

			}

			goto out;

			goto out_freed;

		}

		mutex_lock(&mapping->i_mmap_mutex);

		flush_dcache_mmap_lock(mapping);
@@ -253,6 +254,7 @@ get_write_lock: 
out:

	if (vma)

		vm_flags = vma->vm_flags;

out_freed:

	if (likely(!has_write_lock))

		up_read(&mm->mmap_sem);

	else