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

Commit 4e19fd93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "11 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  .mailmap: add Christophe Ricard
  Make CONFIG_FHANDLE default y
  mm/page_isolation.c: fix the function comments
  oom, oom_reaper: do not enqueue task if it is on the oom_reaper_list head
  mm/page_isolation: fix tracepoint to mirror check function behavior
  mm/rmap: batched invalidations should use existing api
  x86/mm: TLB_REMOTE_SEND_IPI should count pages
  mm: fix invalid node in alloc_migrate_target()
  include/linux/huge_mm.h: return NULL instead of false for pmd_trans_huge_lock()
  mm, kasan: fix compilation for CONFIG_SLAB
  MAINTAINERS: orangefs mailing list is subscribers-only
parents 82d2a348 394532e4

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de> 
Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8253,7 +8253,7 @@ F: Documentation/filesystems/overlayfs.txt 


ORANGEFS FILESYSTEM

M:	Mike Marshall <hubcap@omnibond.com>

L:	pvfs2-developers@beowulf-underground.org

L:	pvfs2-developers@beowulf-underground.org (subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git

S:	Supported

F:	fs/orangefs/

arch/x86/include/asm/tlbflush.h

+0 −6
Original line number Diff line number Diff line
@@ -319,12 +319,6 @@ static inline void reset_lazy_tlbstate(void) 


#endif	/* SMP */



/* Not inlined due to inc_irq_stat not being defined yet */

#define flush_tlb_local() {		\

	inc_irq_stat(irq_tlb_count);	\

	local_flush_tlb();		\

}



#ifndef CONFIG_PARAVIRT

#define flush_tlb_others(mask, mm, start, end)	\

	native_flush_tlb_others(mask, mm, start, end)

arch/x86/mm/tlb.c

+10 −4
Original line number Diff line number Diff line
@@ -104,10 +104,8 @@ static void flush_tlb_func(void *info) 


	inc_irq_stat(irq_tlb_count);



	if (f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))

	if (f->flush_mm && f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))

		return;

	if (!f->flush_end)

		f->flush_end = f->flush_start + PAGE_SIZE;



	count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);

	if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
@@ -135,12 +133,20 @@ void native_flush_tlb_others(const struct cpumask *cpumask, 
				 unsigned long end)

{

	struct flush_tlb_info info;



	if (end == 0)

		end = start + PAGE_SIZE;

	info.flush_mm = mm;

	info.flush_start = start;

	info.flush_end = end;



	count_vm_tlb_event(NR_TLB_REMOTE_FLUSH);

	trace_tlb_flush(TLB_REMOTE_SEND_IPI, end - start);

	if (end == TLB_FLUSH_ALL)

		trace_tlb_flush(TLB_REMOTE_SEND_IPI, TLB_FLUSH_ALL);

	else

		trace_tlb_flush(TLB_REMOTE_SEND_IPI,

				(end - start) >> PAGE_SHIFT);



	if (is_uv_system()) {

		unsigned int cpu;

include/linux/huge_mm.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd, 
	if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd))

		return __pmd_trans_huge_lock(pmd, vma);

	else

		return false;

		return NULL;

}

static inline int hpage_nr_pages(struct page *page)

{