[folded-merged] lib-stackdepot-add-support-to-disable-stack-depot-fix.patch removed from -mm tree

[folded-merged] lib-stackdepot-add-support-to-disable-stack-depot-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: lib-stackdepot-add-support-to-disable-stack-depot-fix
has been removed from the -mm tree.  Its filename was
     lib-stackdepot-add-support-to-disable-stack-depot-fix.patch

This patch was dropped because it was folded into lib-stackdepot-add-support-to-disable-stack-depot.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: lib-stackdepot-add-support-to-disable-stack-depot-fix

fix CONFIG_STACKDEPOT=n build

main.c:(.init.text+0x4c1): undefined reference to `stack_depot_init'

Cc: Alexander Potapenko <glider@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Vijayanand Jitta <vjitta@codeaurora.org>
Cc: Vinayak Menon <vinmenon@codeaurora.org>
Cc: Yogesh Lal <ylal@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/stackdepot.h |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/include/linux/stackdepot.h~lib-stackdepot-add-support-to-disable-stack-depot-fix
+++ a/include/linux/stackdepot.h
@@ -21,5 +21,13 @@ unsigned int stack_depot_fetch(depot_sta
 
 unsigned int filter_irq_stacks(unsigned long *entries, unsigned int nr_entries);
 
+#ifdef CONFIG_STACKDEPOT
 int stack_depot_init(void);
+#else
+static inline int stack_depot_init(void)
+{
+	return 0;
+}
+#endif	/* CONFIG_STACKDEPOT */
+
 #endif
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

lib-stackdepot-add-support-to-disable-stack-depot.patch
seq_file-document-how-per-entry-resources-are-managed-fix.patch
initramfs-panic-with-memory-information-fix.patch
mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch
mm.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch