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:

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

and fixed up the affected commits.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c20d89601802..6acf612fdd99 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4501,8 +4501,9 @@ long si_mem_available(void)
          * Part of the reclaimable slab consists of items that are in use,
          * and cannot be freed. Cap this estimate at the low watermark.
          */
-        available += global_page_state(NR_SLAB_RECLAIMABLE) -
-                     min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
+        available += global_node_page_state(NR_SLAB_RECLAIMABLE) -
+                     min(global_node_page_state(NR_SLAB_RECLAIMABLE) / 2,
+                         wmark_low);
 
         if (available < 0)
                 available = 0;
@@ -4645,8 +4646,8 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask)
                 global_node_page_state(NR_FILE_DIRTY),
                 global_node_page_state(NR_WRITEBACK),
                 global_node_page_state(NR_UNSTABLE_NFS),
-                global_page_state(NR_SLAB_RECLAIMABLE),
-                global_page_state(NR_SLAB_UNRECLAIMABLE),
+                global_node_page_state(NR_SLAB_RECLAIMABLE),
+                global_node_page_state(NR_SLAB_UNRECLAIMABLE),
                 global_node_page_state(NR_FILE_MAPPED),
                 global_node_page_state(NR_SHMEM),
                 global_page_state(NR_PAGETABLE),
@@ -7711,7 +7712,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
 
         /* Make sure the range is really isolated. */
         if (test_pages_isolated(outer_start, end, false)) {
-                pr_info("%s: [%lx, %lx) PFNs busy\n",
+                pr_info_ratelimited("%s: [%lx, %lx) PFNs busy\n",
                         __func__, outer_start, end);
                 ret = -EBUSY;
                 goto done;