]> git.baikalelectronics.ru Git - kernel.git/commit
mm, locking: Fix up flush_tlb_pending() related merge in do_huge_pmd_numa_page()
authorPeter Zijlstra <peterz@infradead.org>
Fri, 11 Aug 2017 12:29:01 +0000 (14:29 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 11 Aug 2017 12:35:29 +0000 (14:35 +0200)
commit68e85c82ad5e5c2f8c65c1326766f9b4b4390313
treee0342f48c0c742f18cb92d1b697bbcf30d1500f0
parent1caba2f5a885e093a025a82a77873142ac3e97f4
mm, locking: Fix up flush_tlb_pending() related merge in do_huge_pmd_numa_page()

Merge commit:

  1caba2f5a885 ("Merge branch 'linus' into locking/core, to resolve conflicts")

overlooked the fact that do_huge_pmd_numa_page() now does two TLB
flushes. Commit:

  7c7b3a440efa ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")

and commit:

  28aeaa794d95 ("Revert "mm: numa: defer TLB flush for THP migration as long as possible"")

Both moved the TLB flush around but slightly different, the end result
being that what was one became two.

Clean this up.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
mm/huge_memory.c