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

Commit 800f1ac4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "17 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MIPS: fix DMA contiguous allocation
  sh64: fix __NR_fgetxattr
  ocfs2: fix SGID not inherited issue
  mm/oom_kill.c: avoid attempting to kill init sharing same memory
  drivers/base/memory.c: prohibit offlining of memory blocks with missing sections
  tmpfs: fix shmem_evict_inode() warnings on i_blocks
  mm/hugetlb.c: fix resv map memory leak for placeholder entries
  mm: hugetlb: call huge_pte_alloc() only if ptep is null
  kernel: remove stop_machine() Kconfig dependency
  mm: kmemleak: mark kmemleak_init prototype as __init
  mm: fix kerneldoc on mem_cgroup_replace_page
  osd fs: __r4w_get_page rely on PageUptodate for uptodate
  MAINTAINERS: make Vladimir co-maintainer of the memory controller
  mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress
  mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo
  memcg: fix memory.high target
  mm: hugetlb: fix hugepage memory leak caused by wrong reserve count
parents a971526e 9530d0fe

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2975,6 +2975,7 @@ F: kernel/cpuset.c 
CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)

M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@kernel.org>

M:	Vladimir Davydov <vdavydov@virtuozzo.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

S:	Maintained

arch/mips/mm/dma-default.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, 


	gfp = massage_gfp_flags(dev, gfp);



	if (IS_ENABLED(CONFIG_DMA_CMA) && !(gfp & GFP_ATOMIC))

	if (IS_ENABLED(CONFIG_DMA_CMA) && gfpflags_allow_blocking(gfp))

		page = dma_alloc_from_contiguous(dev,

					count, get_order(size));

	if (!page)

arch/sh/include/uapi/asm/unistd_64.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ 
#define __NR_fsetxattr		256

#define __NR_getxattr		257

#define __NR_lgetxattr		258

#define __NR_fgetxattr		269

#define __NR_fgetxattr		259

#define __NR_listxattr		260

#define __NR_llistxattr		261

#define __NR_flistxattr		262

drivers/base/memory.c

+4 −0
Original line number Diff line number Diff line
@@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev) 
	if (mem->state == MEM_OFFLINE)

		return 0;



	/* Can't offline block with non-present sections */

	if (mem->section_count != sections_per_block)

		return -EINVAL;



	return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);

}

fs/exofs/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -592,9 +592,6 @@ static struct page *__r4w_get_page(void *priv, u64 offset, bool *uptodate) 
			}

			unlock_page(page);

		}

		if (PageDirty(page) || PageWriteback(page))

			*uptodate = true;

		else

		*uptodate = PageUptodate(page);

		EXOFS_DBGMSG2("index=0x%lx uptodate=%d\n", index, *uptodate);

		return page;