Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits

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

3 files changed, 3 insertions, 14 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4e35a5d767ed..d780351835e9 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1238,21 +1238,9 @@ config RCU_CPU_STALL_TIMEOUT
           RCU grace period persists, additional CPU stall warnings are
           printed at more widely spaced intervals.
 
-config RCU_CPU_STALL_VERBOSE
-        bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR"
-        depends on TREE_PREEMPT_RCU
-        default y
-        help
-          This option causes RCU to printk detailed per-task information
-          for any tasks that are stalling the current RCU grace period.
-
-          Say N if you are unsure.
-
-          Say Y if you want to enable such checks.
-
 config RCU_CPU_STALL_INFO
         bool "Print additional diagnostics on RCU CPU stall"
-        depends on (TREE_RCU || TREE_PREEMPT_RCU) && DEBUG_KERNEL
+        depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
         default n
         help
           For each stalled CPU that is aware of the current RCU grace
diff --git a/lib/genalloc.c b/lib/genalloc.c
index cce4dd68c40d..2e65d206b01c 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -598,6 +598,7 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
 
         return pool;
 }
+EXPORT_SYMBOL(devm_gen_pool_create);
 
 /**
  * dev_get_gen_pool - Obtain the gen_pool (if any) for a device
diff --git a/lib/show_mem.c b/lib/show_mem.c
index 09225796991a..5e256271b47b 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -28,7 +28,7 @@ void show_mem(unsigned int filter)
                                 continue;
 
                         total += zone->present_pages;
-                        reserved = zone->present_pages - zone->managed_pages;
+                        reserved += zone->present_pages - zone->managed_pages;
 
                         if (is_highmem_idx(zoneid))
                                 highmem += zone->present_pages;