]> git.karo-electronics.de Git - karo-tx-linux.git/commit
mm-fix-tlb-flush-race-between-migration-and-change_protection_range-fix
authorMel Gorman <mgorman@suse.de>
Mon, 16 Dec 2013 23:44:45 +0000 (10:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 16 Dec 2013 23:44:45 +0000 (10:44 +1100)
commitc18de684d2b6251fd8ed0779f93a81077c93bfcd
tree22901e39e04e50072b5c51c1aca835c532ff704a
parentb772e4c6c0220cdf834cc5173fdbb1e65d714e74
mm-fix-tlb-flush-race-between-migration-and-change_protection_range-fix

The following build error was reported by the 0-day build checker.

>> arch/arm/mm/context.c:51:18: error: 'tlb_flush_pending' redeclared as different kind of symbol
   include/linux/mm_types.h:477:91: note: previous definition of 'tlb_flush_pending' was here

This patch renames tlb_flush_pending to
mm_tlb_flush_pending. This is a fix for the -mm patch
mm-fix-tlb-flush-race-between-migration-and-change_protection_range.patch

Note that when slotted into place that it will cause a conflict with
mm-numa-defer-tlb-flush-for-thp-migration-as-long-as-possible.patch . The
resolution is to delete the call from huge_memory.c and make sure the
tlb_flush_pending call in mm/migrate.c is renamed appropriately.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Alex Thorlton <athorlton@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/x86/include/asm/pgtable.h
include/linux/mm_types.h
mm/huge_memory.c