Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to the newly
added ITG-3200 driver.

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/slob.c b/mm/slob.c
index a99fdf7a0907..eeed4a05a2ef 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -360,7 +360,7 @@ static void slob_free(void *block, int size)
                         clear_slob_page_free(sp);
                 spin_unlock_irqrestore(&slob_lock, flags);
                 __ClearPageSlab(sp);
-                reset_page_mapcount(sp);
+                page_mapcount_reset(sp);
                 slob_free_pages(b, 0);
                 return;
         }