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

Commit 040cca3a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into locking/core, to resolve conflicts 



 Conflicts:
	include/linux/mm_types.h
	mm/huge_memory.c

I removed the smp_mb__before_spinlock() like the following commit does:

  8b1b436d ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")

and fixed up the affected commits.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ef0758dd b2dbdf2c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14004,6 +14004,7 @@ F: drivers/block/virtio_blk.c 
F:	include/linux/virtio*.h

F:	include/uapi/linux/virtio_*.h

F:	drivers/crypto/virtio/

F:	mm/balloon_compaction.c



VIRTIO CRYPTO DRIVER

M:	Gonglei <arei.gonglei@huawei.com>

arch/arm/include/asm/tlb.h

+9 −2
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->fullmm = !(start | (end+1));
@@ -166,8 +167,14 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
}



static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

			unsigned long start, unsigned long end, bool force)

{

	if (force) {

		tlb->range_start = start;

		tlb->range_end = end;

	}



	tlb_flush_mmu(tlb);



	/* keep the page table cache within bounds */

arch/ia64/include/asm/tlb.h

+6 −2
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ static inline void __tlb_alloc_page(struct mmu_gather *tlb) 




static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->max = ARRAY_SIZE(tlb->local);
@@ -185,8 +186,11 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
 * collected.

 */

static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

			unsigned long start, unsigned long end, bool force)

{

	if (force)

		tlb->need_flush = 1;

	/*

	 * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and

	 * tlb->end_addr.

arch/s390/include/asm/tlb.h

+11 −6
Original line number Diff line number Diff line
@@ -47,10 +47,9 @@ struct mmu_table_batch { 
extern void tlb_table_flush(struct mmu_gather *tlb);

extern void tlb_remove_table(struct mmu_gather *tlb, void *table);



static inline void tlb_gather_mmu(struct mmu_gather *tlb,

				  struct mm_struct *mm,

				  unsigned long start,

				  unsigned long end)

static inline void

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->start = start;
@@ -76,9 +75,15 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 
	tlb_flush_mmu_free(tlb);

}



static inline void tlb_finish_mmu(struct mmu_gather *tlb,

				  unsigned long start, unsigned long end)

static inline void

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end, bool force)

{

	if (force) {

		tlb->start = start;

		tlb->end = end;

	}



	tlb_flush_mmu(tlb);

}

arch/sh/include/asm/tlb.h

+5 −3
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ static inline void init_tlb_gather(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

		unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->start = start;
@@ -47,9 +48,10 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
}



static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end, bool force)

{

	if (tlb->fullmm)

	if (tlb->fullmm || force)

		flush_tlb_mm(tlb->mm);



	/* keep the page table cache within bounds */