Merge remote-tracking branch 'savannah/master' into dev

1 files changed, 17 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index fbfa814bcd8..ff6681cc760 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7225,6 +7225,20 @@ Frames, windows, buffers, and subprocesses count as vectors
                 make_int (strings_consed));
 }
 
+#ifdef GNU_LINUX
+DEFUN ("malloc-info", Fmalloc_info, Smalloc_info, 0, 0, "",
+       doc: /* Report malloc information to stderr.
+This function outputs to stderr an XML-formatted
+description of the current state of the memory-allocation
+arenas.  */)
+  (void)
+{
+  if (malloc_info (0, stderr))
+    error ("malloc_info failed: %s", emacs_strerror (errno));
+  return Qnil;
+}
+#endif
+
 static bool
 symbol_uses_obj (Lisp_Object symbol, Lisp_Object obj)
 {
@@ -7569,6 +7583,9 @@ N should be nonnegative.  */);
   defsubr (&Sgarbage_collect);
   defsubr (&Smemory_info);
   defsubr (&Smemory_use_counts);
+#ifdef GNU_LINUX
+  defsubr (&Smalloc_info);
+#endif
   defsubr (&Ssuspicious_object);
 
   Lisp_Object watcher;