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

Commit bde17b90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "12 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  dmapool: fix overflow condition in pool_find_page()
  thermal: avoid division by zero in power allocator
  memcg: remove pcp_counter_lock
  kprobes: use _do_fork() in samples to make them work again
  drivers/input/joystick/Kconfig: zhenhua.c needs BITREVERSE
  memcg: make mem_cgroup_read_stat() unsigned
  memcg: fix dirty page migration
  dax: fix NULL pointer in __dax_pmd_fault()
  mm: hugetlbfs: skip shared VMAs when unmapping private pages to satisfy a fault
  mm/slab: fix unexpected index mapping result of kmalloc_size(INDEX_NODE+1)
  userfaultfd: remove kernel header include from uapi header
  arch/x86/include/asm/efi.h: fix build failure
parents 1bca1000 676bd991

arch/x86/include/asm/efi.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ extern u64 asmlinkage efi_call(void *fp, ...); 
extern void __iomem *__init efi_ioremap(unsigned long addr, unsigned long size,

					u32 type, u64 attribute);



#ifdef CONFIG_KASAN

/*

 * CONFIG_KASAN may redefine memset to __memset.  __memset function is present

 * only in kernel binary.  Since the EFI stub linked into a separate binary it
@@ -95,6 +96,7 @@ extern void __iomem *__init efi_ioremap(unsigned long addr, unsigned long size, 
#undef memcpy

#undef memset

#undef memmove

#endif



#endif /* CONFIG_X86_32 */

drivers/input/joystick/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ config JOYSTICK_TWIDJOY 
config JOYSTICK_ZHENHUA

	tristate "5-byte Zhenhua RC transmitter"

	select SERIO

	select BITREVERSE

	help

	  Say Y here if you have a Zhen Hua PPM-4CH transmitter which is

	  supplied with a ready to fly micro electric indoor helicopters

drivers/thermal/power_allocator.c

+10 −0
Original line number Diff line number Diff line
@@ -144,6 +144,16 @@ static void estimate_pid_constants(struct thermal_zone_device *tz, 
		switch_on_temp = 0;



	temperature_threshold = control_temp - switch_on_temp;

	/*

	 * estimate_pid_constants() tries to find appropriate default

	 * values for thermal zones that don't provide them. If a

	 * system integrator has configured a thermal zone with two

	 * passive trip points at the same temperature, that person

	 * hasn't put any effort to set up the thermal zone properly

	 * so just give up.

	 */

	if (!temperature_threshold)

		return;



	if (!tz->tzp->k_po || force)

		tz->tzp->k_po = int_to_frac(sustainable_power) /

fs/dax.c

+12 −1
Original line number Diff line number Diff line
@@ -569,8 +569,20 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
	if (!buffer_size_valid(&bh) || bh.b_size < PMD_SIZE)

		goto fallback;



	sector = bh.b_blocknr << (blkbits - 9);



	if (buffer_unwritten(&bh) || buffer_new(&bh)) {

		int i;



		length = bdev_direct_access(bh.b_bdev, sector, &kaddr, &pfn,

						bh.b_size);

		if (length < 0) {

			result = VM_FAULT_SIGBUS;

			goto out;

		}

		if ((length < PMD_SIZE) || (pfn & PG_PMD_COLOUR))

			goto fallback;



		for (i = 0; i < PTRS_PER_PMD; i++)

			clear_pmem(kaddr + i * PAGE_SIZE, PAGE_SIZE);

		wmb_pmem();
@@ -623,7 +635,6 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
		result = VM_FAULT_NOPAGE;

		spin_unlock(ptl);

	} else {

		sector = bh.b_blocknr << (blkbits - 9);

		length = bdev_direct_access(bh.b_bdev, sector, &kaddr, &pfn,

						bh.b_size);

		if (length < 0) {

include/linux/memcontrol.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ struct mem_cgroup { 
	 * percpu counter.

	 */

	struct mem_cgroup_stat_cpu __percpu *stat;

	spinlock_t pcp_counter_lock;



#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)

	struct cg_proto tcp_mem;